wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Jacek Caban : jscript: Added RegExp.toString() implementation.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: f34722e772303c30c3ce0eac1d3ee2e445762809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34722e772303c30c3ce0eac1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 27 13:57:07 2013 +0200 jscript: Added RegExp.toString() implementation. --- dlls/jscript/jsregexp.c | 46 ++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/regexp.js | 12 +++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 0104f3e..d6602f4 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -333,8 +333,50 @@ static HRESULT RegExp_lastIndex(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, static HRESULT RegExp_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + RegExpInstance *regexp; + unsigned len, f; + jsstr_t *ret; + WCHAR *ptr; + + TRACE("\n"); + + if(!is_vclass(jsthis, JSCLASS_REGEXP)) { + FIXME("Not a RegExp\n"); + return E_NOTIMPL; + } + + regexp = regexp_from_vdisp(jsthis); + + if(!r) + return S_OK; + + len = jsstr_length(regexp->str) + 2; + + f = regexp->jsregexp->flags; + if(f & REG_FOLD) + len++; + if(f & REG_GLOB) + len++; + if(f & REG_MULTILINE) + len++; + + ptr = jsstr_alloc_buf(len, &ret); + if(!ptr) + return E_OUTOFMEMORY; + + *ptr++ = '/'; + ptr += jsstr_flush(regexp->str, ptr); + *ptr++ = '/'; + + if(f & REG_FOLD) + *ptr++ = 'i'; + if(f & REG_GLOB) + *ptr++ = 'g'; + if(f & REG_MULTILINE) + *ptr++ = 'm'; + + *r = jsval_string(ret); + return S_OK; } static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input_str, diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 69aa6b7..25ec91e 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -648,4 +648,16 @@ ok(!("$10" in RegExp), "RegExp.$10 exists"); RegExp.$1 = "a"; ok(RegExp.$1 === "b", "RegExp.$1 = " + RegExp.$1); +ok(/abc/.toString() === "/abc/", "/abc/.toString() = " + /abc/.toString()); +ok(/\//.toString() === "/\\//", "/\//.toString() = " + /\//.toString()); +tmp = new RegExp("abc/"); +ok(tmp.toString() === "/abc//", "(new RegExp(\"abc/\")).toString() = " + tmp.toString()); +ok(/abc/g.toString() === "/abc/g", "/abc/g.toString() = " + /abc/g.toString()); +ok(/abc/i.toString() === "/abc/i", "/abc/i.toString() = " + /abc/i.toString()); +ok(/abc/ig.toString() === "/abc/ig", "/abc/ig.toString() = " + /abc/ig.toString()); +ok(/abc/mgi.toString() === "/abc/igm", "/abc/mgi.toString() = " + /abc/mgi.toString()); +tmp = new RegExp("abc/", "mgi"); +ok(tmp.toString() === "/abc//igm", "(new RegExp(\"abc/\")).toString() = " + tmp.toString()); +ok(/abc/.toString(1, false, "3") === "/abc/", "/abc/.toString(1, false, \"3\") = " + /abc/.toString()); + reportSuccess();

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMTEXTURE.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 769efb1f63e28a41b63f4431c93a741036fb31c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=769efb1f63e28a41b63f4431c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 09:22:51 2013 +0200 d3drm: Avoid LPDIRECT3DRMTEXTURE. --- dlls/d3drm/d3drm.c | 20 ++++++++------------ dlls/d3drm/frame.c | 22 +++++++--------------- dlls/d3drm/meshbuilder.c | 14 +++++++------- dlls/d3drm/tests/d3drm.c | 16 ++++++++-------- include/d3drm.h | 4 ++-- include/d3drmobj.h | 26 +++++++++++++------------- 6 files changed, 45 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=769efb1f63e28a41b63f4…

1 0

Henri Verbeet : wined3d: Get rid of the unused "streams" field from struct wined3d_vertex_declaration.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 273dcbf564e445b3639936dc9b67f4fe737cb685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=273dcbf564e445b3639936dc9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 09:22:50 2013 +0200 wined3d: Get rid of the unused "streams" field from struct wined3d_vertex_declaration. --- dlls/wined3d/vertexdeclaration.c | 8 -------- dlls/wined3d/wined3d_private.h | 6 ++---- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 13f4490..cf5378c 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -164,7 +164,6 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - WORD preloaded = 0; /* MAX_STREAMS, 16 */ unsigned int i; if (TRACE_ON(d3d_decl)) @@ -224,13 +223,6 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara return E_FAIL; } - if (!(preloaded & (1 << e->input_slot))) - { - declaration->streams[declaration->num_streams] = e->input_slot; - ++declaration->num_streams; - preloaded |= 1 << e->input_slot; - } - if (elements[i].format == WINED3DFMT_R16G16_FLOAT || elements[i].format == WINED3DFMT_R16G16B16A16_FLOAT) { if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) declaration->half_float_conv_needed = TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e5ea47e..8d6f845 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2239,10 +2239,8 @@ struct wined3d_vertex_declaration struct wined3d_vertex_declaration_element *elements; UINT element_count; - DWORD streams[MAX_STREAMS]; - UINT num_streams; - BOOL position_transformed; - BOOL half_float_conv_needed; + BOOL position_transformed; + BOOL half_float_conv_needed; }; struct wined3d_saved_states

1 0

Henri Verbeet : wined3d: Don't create FBOs in context_bind_fbo().
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: b35045ba2535c1e8046b532e1a8cd1c77895b77b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b35045ba2535c1e8046b532e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 09:22:49 2013 +0200 wined3d: Don't create FBOs in context_bind_fbo(). We can just do this in context_create_fbo_entry() now. --- dlls/wined3d/context.c | 66 +++++++++++++++++++----------------------------- 1 files changed, 26 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e6f2c1a..584683d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -38,43 +38,27 @@ static DWORD wined3d_context_tls_idx; /* FBO helper functions */ /* Context activation is done by the caller. */ -static void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) +static void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint fbo) { const struct wined3d_gl_info *gl_info = context->gl_info; - GLuint f; - - if (!fbo) - { - f = 0; - } - else - { - if (!*fbo) - { - gl_info->fbo_ops.glGenFramebuffers(1, fbo); - checkGLcall("glGenFramebuffers()"); - TRACE("Created FBO %u.\n", *fbo); - } - f = *fbo; - } switch (target) { case GL_READ_FRAMEBUFFER: - if (context->fbo_read_binding == f) return; - context->fbo_read_binding = f; + if (context->fbo_read_binding == fbo) return; + context->fbo_read_binding = fbo; break; case GL_DRAW_FRAMEBUFFER: - if (context->fbo_draw_binding == f) return; - context->fbo_draw_binding = f; + if (context->fbo_draw_binding == fbo) return; + context->fbo_draw_binding = fbo; break; case GL_FRAMEBUFFER: - if (context->fbo_read_binding == f - && context->fbo_draw_binding == f) return; - context->fbo_read_binding = f; - context->fbo_draw_binding = f; + if (context->fbo_read_binding == fbo + && context->fbo_draw_binding == fbo) return; + context->fbo_read_binding = fbo; + context->fbo_draw_binding = fbo; break; default: @@ -82,7 +66,7 @@ static void context_bind_fbo(struct wined3d_context *context, GLenum target, GLu break; } - gl_info->fbo_ops.glBindFramebuffer(target, f); + gl_info->fbo_ops.glBindFramebuffer(target, fbo); checkGLcall("glBindFramebuffer()"); } @@ -104,15 +88,15 @@ static void context_clean_fbo_attachments(const struct wined3d_gl_info *gl_info, } /* Context activation is done by the caller. */ -static void context_destroy_fbo(struct wined3d_context *context, GLuint *fbo) +static void context_destroy_fbo(struct wined3d_context *context, GLuint fbo) { const struct wined3d_gl_info *gl_info = context->gl_info; context_bind_fbo(context, GL_FRAMEBUFFER, fbo); context_clean_fbo_attachments(gl_info, GL_FRAMEBUFFER); - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + context_bind_fbo(context, GL_FRAMEBUFFER, 0); - gl_info->fbo_ops.glDeleteFramebuffers(1, fbo); + gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); checkGLcall("glDeleteFramebuffers()"); } @@ -338,7 +322,9 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * entry->location = location; entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); entry->attached = FALSE; - entry->id = 0; + gl_info->fbo_ops.glGenFramebuffers(1, &entry->id); + checkGLcall("glGenFramebuffers()"); + TRACE("Created FBO %u.\n", entry->id); return entry; } @@ -350,7 +336,7 @@ static void context_reuse_fbo_entry(struct wined3d_context *context, GLenum targ { const struct wined3d_gl_info *gl_info = context->gl_info; - context_bind_fbo(context, target, &entry->id); + context_bind_fbo(context, target, entry->id); context_clean_fbo_attachments(gl_info, target); memcpy(entry->render_targets, render_targets, gl_info->limits.buffers * sizeof(*entry->render_targets)); @@ -364,8 +350,8 @@ static void context_destroy_fbo_entry(struct wined3d_context *context, struct fb { if (entry->id) { - TRACE("Destroy FBO %d\n", entry->id); - context_destroy_fbo(context, &entry->id); + TRACE("Destroy FBO %u.\n", entry->id); + context_destroy_fbo(context, entry->id); } --context->fbo_entry_count; list_remove(&entry->entry); @@ -428,13 +414,13 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ if (entry->attached) { - context_bind_fbo(context, target, &entry->id); + context_bind_fbo(context, target, entry->id); return; } read_binding = context->fbo_read_binding; draw_binding = context->fbo_draw_binding; - context_bind_fbo(context, GL_FRAMEBUFFER, &entry->id); + context_bind_fbo(context, GL_FRAMEBUFFER, entry->id); /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) @@ -454,9 +440,9 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ if (target != GL_FRAMEBUFFER) { if (target == GL_READ_FRAMEBUFFER) - context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, draw_binding ? &draw_binding : NULL); + context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, draw_binding); else - context_bind_fbo(context, GL_READ_FRAMEBUFFER, read_binding ? &read_binding : NULL); + context_bind_fbo(context, GL_READ_FRAMEBUFFER, read_binding); } entry->attached = TRUE; @@ -475,14 +461,14 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ if (context->rebind_fbo) { - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + context_bind_fbo(context, GL_FRAMEBUFFER, 0); context->rebind_fbo = FALSE; } if (location == SFLAG_INDRAWABLE) { context->current_fbo = NULL; - context_bind_fbo(context, target, NULL); + context_bind_fbo(context, target, 0); } else { @@ -2150,7 +2136,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine else { context->current_fbo = NULL; - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + context_bind_fbo(context, GL_FRAMEBUFFER, 0); rt_mask = context_generate_rt_mask_from_surface(rt); } }

1 0

Henri Verbeet : wined3d: Also clear context-> current_fbo in context_apply_blit_state().
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 7ca6839c943229cce653586da3c14d7e11fd4d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca6839c943229cce653586da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 09:22:48 2013 +0200 wined3d: Also clear context->current_fbo in context_apply_blit_state(). The draw buffer handling code depends on this being current. This fixes a bug exposed by commit 075fa6547c0edf2b1b2c1cabae7731fdc1308cc2. --- dlls/wined3d/context.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5b3fd62..e6f2c1a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2149,6 +2149,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine } else { + context->current_fbo = NULL; context_bind_fbo(context, GL_FRAMEBUFFER, NULL); rt_mask = context_generate_rt_mask_from_surface(rt); }

1 0

Alistair Leslie-Hughes : oledb32: GetConversionSize only returns a valid size of BSTR.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 338cb2e5dd70320b45b23c4456262422faefac41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=338cb2e5dd70320b45b23c445… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 15:12:24 2013 +1000 oledb32: GetConversionSize only returns a valid size of BSTR. --- dlls/oledb32/convert.c | 34 ++++++++-------------------------- dlls/oledb32/tests/convert.c | 1 - 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 9550e52..abbc76b 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1305,7 +1305,6 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, switch (dst_type) { case DBTYPE_STR: - { switch (src_type) { case DBTYPE_VARIANT: @@ -1326,26 +1325,16 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, FIXME("unimplemented for %04x -> DBTYPE_STR\n", src_type); return E_NOTIMPL; } - } - break; + break; case DBTYPE_WSTR: - { switch (src_type) { case DBTYPE_VARIANT: - { - VARIANT v; - - VariantInit(&v); - if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) - { - *dst_len = (SysStringLen(V_BSTR(&v)) + 1) * sizeof(WCHAR); - VariantClear(&v); - } + if(V_VT((VARIANT*)src) == VT_BSTR) + *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))+1) * sizeof(WCHAR); else - return hr; - } - break; + WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src)); + break; case DBTYPE_STR: if(src_len) *dst_len = (*src_len + 1) * sizeof(WCHAR); @@ -1362,28 +1351,21 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, FIXME("unimplemented for %04x -> DBTYPE_WSTR\n", src_type); return E_NOTIMPL; } - } - break; + break; case DBTYPE_BYTES: - { switch (src_type) { case DBTYPE_VARIANT: - { if(V_VT((VARIANT*)src) == VT_BSTR) *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))) / sizeof(WCHAR); else WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src)); - - return S_OK; - } - break; + break; default: FIXME("unimplemented for %04x -> DBTYPE_BYTES\n", src_type); return E_NOTIMPL; } - } - break; + break; default: FIXME("unimplemented for conversion %d->%d\n", src_type, dst_type); return E_NOTIMPL; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index a3884dc..ff44e0a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2461,7 +2461,6 @@ static void test_getconversionsize(void) V_I4(&var) = 4; hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &src_len, &dst_len, &var); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(dst_len == 110, "%ld\n", dst_len); VariantClear(&var); dst_len = 0;

1 0

Alistair Leslie-Hughes : oledb32: Implement GetConversionSize DBTYPE_VARIANT -> DBTYPE_BYTES.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 0fe64ce339e2b47ff2c7369a6463b61cbffbe713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe64ce339e2b47ff2c7369a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 21 20:39:09 2013 +1000 oledb32: Implement GetConversionSize DBTYPE_VARIANT -> DBTYPE_BYTES. --- dlls/oledb32/convert.c | 23 ++++++++++++++++++++++- dlls/oledb32/tests/convert.c | 15 +++++++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 490685b..9550e52 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -121,7 +121,7 @@ static int get_length(DBTYPE type) case DBTYPE_UI2: return 2; case DBTYPE_BOOL: - return sizeof(VARIANT_BOOL); + return sizeof(VARIANT_BOOL); case DBTYPE_I4: case DBTYPE_UI4: case DBTYPE_R4: @@ -143,6 +143,7 @@ static int get_length(DBTYPE type) return sizeof(FILETIME); case DBTYPE_GUID: return sizeof(GUID); + case DBTYPE_BYTES: case DBTYPE_WSTR: case DBTYPE_STR: case DBTYPE_BYREF | DBTYPE_WSTR: @@ -1363,6 +1364,26 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, } } break; + case DBTYPE_BYTES: + { + switch (src_type) + { + case DBTYPE_VARIANT: + { + if(V_VT((VARIANT*)src) == VT_BSTR) + *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))) / sizeof(WCHAR); + else + WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src)); + + return S_OK; + } + break; + default: + FIXME("unimplemented for %04x -> DBTYPE_BYTES\n", src_type); + return E_NOTIMPL; + } + } + break; default: FIXME("unimplemented for conversion %d->%d\n", src_type, dst_type); return E_NOTIMPL; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 089b28c..a3884dc 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2464,6 +2464,21 @@ static void test_getconversionsize(void) todo_wine ok(dst_len == 110, "%ld\n", dst_len); VariantClear(&var); + dst_len = 0; + src_len = 20; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 2, "%ld\n", dst_len); + VariantClear(&var); + + dst_len = 0; + src_len = 20; + V_VT(&var) = VT_NULL; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); } static void test_converttobytes(void)

1 0

Alistair Leslie-Hughes : oledb32: Check for DBSTATUS_S_ISNULL first.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 5b8a375ab92cde38d3f299f0ee3454949adb6504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8a375ab92cde38d3f299f0e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 15:35:30 2013 +1000 oledb32: Check for DBSTATUS_S_ISNULL first. --- dlls/oledb32/convert.c | 10 +++++----- dlls/oledb32/tests/convert.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a33f933..490685b 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -179,11 +179,6 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, *dst_status = DBSTATUS_E_BADACCESSOR; - if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK) - { - return DB_E_UNSUPPORTEDCONVERSION; - } - if(src_status == DBSTATUS_S_ISNULL) { *dst_status = DBSTATUS_S_ISNULL; @@ -191,6 +186,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return S_OK; } + if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK) + { + return DB_E_UNSUPPORTEDCONVERSION; + } + if(dst == NULL && get_length(dst_type) != 0) { *dst_len = get_length(src_type); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 88dc1d3..089b28c 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2714,6 +2714,21 @@ static void test_converttotimestamp(void) SysFreeString(bstr); } +static void test_converttoiunknown(void) +{ + HRESULT hr; + DBSTATUS dst_status; + DBLENGTH dst_len; + IUnknown *dst = NULL; + static WCHAR strW[] = {'t','e','s','t',0}; + + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_IUNKNOWN, sizeof(strW), &dst_len, strW, dst, sizeof(dst), DBSTATUS_S_ISNULL, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == 0, "got %ld\n", dst_len); +} + START_TEST(convert) { HRESULT hr; @@ -2751,6 +2766,7 @@ START_TEST(convert) test_converttodbdate(); test_getconversionsize(); test_converttotimestamp(); + test_converttoiunknown(); IDataConvert_Release(convert);

1 0

Alistair Leslie-Hughes : oledb32: DataConvert Support NULL variant in, DBTYPE_VARIANT->DBTYPE_WSTR.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: a1baa22d470cb6fcf1ce8e803ff9854e1b6dd926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1baa22d470cb6fcf1ce8e803… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 12:23:18 2013 +1000 oledb32: DataConvert Support NULL variant in, DBTYPE_VARIANT->DBTYPE_WSTR. --- dlls/oledb32/convert.c | 3 ++- dlls/oledb32/tests/convert.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a2fd0cb..a33f933 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -787,7 +787,8 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, src, &b, sizeof(BSTR), src_status, dst_status, precision, scale, flags); - if(hr != S_OK) return hr; + if(hr != S_OK || *dst_status == DBSTATUS_S_ISNULL) + return hr; bstr_len = SysStringLen(b); *dst_len = bstr_len * sizeof(WCHAR); /* Doesn't include size for '\0' */ *dst_status = DBSTATUS_S_OK; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index fd69fed..88dc1d3 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1017,6 +1017,7 @@ static void test_converttowstr(void) static const WCHAR hexunpacked_w[] = {'5','7','0','0','6','9','0','0','6','E','0','0','6','5','0','0','0','0','0','0', 0 }; static const WCHAR hexpacked_w[] = {'W','i','n','e', 0 }; BSTR b; + VARIANT v; memset(dst, 0xcc, sizeof(dst)); dst_len = 0x1234; @@ -1470,6 +1471,24 @@ static void test_converttowstr(void) ok(dst_len == 0, "got %ld\n", dst_len); ok(dst[0] == 0, "not null terminated\n"); ok(dst[1] == 0xcccc, "clobbered buffer\n"); + + b = SysAllocStringLen(NULL, 0); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = b; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 0, "got %ld\n", dst_len); + ok(dst != NULL, "got %p\n", dst); + ok(dst != b, "got %p src %p\n", dst, b); + ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); + VariantClear(&v); + + V_VT(&v) = VT_NULL; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == 0, "got %ld\n", dst_len); } static void test_converttostr(void)

1 0

Nikolay Sivov : comctl32: Return previously set colors for PBM_SETBKCOLOR and PBM_SETBARCOLOR.
by Alexandre Julliard 27 May '13

27 May '13

Module: wine Branch: master Commit: 65a47e3df65159a34fc67f35d14958e9ad831069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a47e3df65159a34fc67f35d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 25 20:12:12 2013 +0400 comctl32: Return previously set colors for PBM_SETBKCOLOR and PBM_SETBARCOLOR. --- dlls/comctl32/progress.c | 14 +++++++++++--- dlls/comctl32/tests/progress.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index aba5302..989c61e 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -544,7 +544,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case WM_CREATE: { DWORD dwExStyle = GetWindowLongW (hwnd, GWL_EXSTYLE); - + theme = OpenThemeData (hwnd, themeClass); dwExStyle &= ~(WS_EX_CLIENTEDGE | WS_EX_WINDOWEDGE); @@ -690,17 +690,25 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, return infoPtr->CurVal; case PBM_SETBARCOLOR: + { + COLORREF clr = infoPtr->ColorBar; + infoPtr->ColorBar = (COLORREF)lParam; InvalidateRect(hwnd, NULL, TRUE); - return 0; + return clr; + } case PBM_GETBARCOLOR: return infoPtr->ColorBar; case PBM_SETBKCOLOR: + { + COLORREF clr = infoPtr->ColorBk; + infoPtr->ColorBk = (COLORREF)lParam; InvalidateRect(hwnd, NULL, TRUE); - return 0; + return clr; + } case PBM_GETBKCOLOR: return infoPtr->ColorBk; diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 3083e8b..59a4b00 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -32,6 +32,11 @@ static HWND hProgressParentWnd, hProgressWnd; static const char progressTestClass[] = "ProgressBarTestClass"; +static HWND create_progress(DWORD style) +{ + return CreateWindowExA(0, PROGRESS_CLASSA, "", WS_VISIBLE | style, + 0, 0, 100, 20, NULL, NULL, GetModuleHandleA(NULL), 0); +} /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) @@ -224,12 +229,40 @@ static void test_redraw(void) ok(erased, "Progress bar should have erased the background\n"); } +static void test_setcolors(void) +{ + HWND progress; + COLORREF clr; + + progress = create_progress(PBS_SMOOTH); + + clr = SendMessageA(progress, PBM_SETBARCOLOR, 0, 0); + ok(clr == CLR_DEFAULT, "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBARCOLOR, 0, RGB(0, 255, 0)); + ok(clr == 0, "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBARCOLOR, 0, CLR_DEFAULT); + ok(clr == RGB(0, 255, 0), "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBKCOLOR, 0, 0); + ok(clr == CLR_DEFAULT, "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBKCOLOR, 0, RGB(255, 0, 0)); + ok(clr == 0, "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBKCOLOR, 0, CLR_DEFAULT); + ok(clr == RGB(255, 0, 0), "got %x\n", clr); + + DestroyWindow(progress); +} START_TEST(progress) { init(); test_redraw(); - + test_setcolors(); + cleanup(); }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013