September 2016 - Wine-Commits

Alexandre Julliard : winex11: Remove support for exporting the CF_METAFILEPICT format.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 29fc759d529ab69d0af416a547552cfa4099ab17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fc759d529ab69d0af416a54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 27 21:40:36 2016 +0900 winex11: Remove support for exporting the CF_METAFILEPICT format. It can be synthesized from CF_ENHMETAFILE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 47 ------------------------------------------ dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11drv_main.c | 1 - 3 files changed, 49 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 63d11dd..4ee8604 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -110,7 +110,6 @@ struct clipboard_format static HANDLE import_data( Atom type, const void *data, size_t size ); static HANDLE import_enhmetafile( Atom type, const void *data, size_t size ); -static HANDLE import_metafile( Atom type, const void *data, size_t size ); static HANDLE import_pixmap( Atom type, const void *data, size_t size ); static HANDLE import_image_bmp( Atom type, const void *data, size_t size ); static HANDLE import_string( Atom type, const void *data, size_t size ); @@ -125,7 +124,6 @@ static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom ta static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_pixmap( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_metafile( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_enhmetafile( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); @@ -157,7 +155,6 @@ static const struct { 0, CF_UNICODETEXT, XA_STRING, import_string, export_string }, { 0, CF_UNICODETEXT, XATOM_text_plain, import_string, export_string }, { 0, CF_BITMAP, XATOM_WCF_BITMAP, import_data, NULL }, - { 0, CF_METAFILEPICT, XATOM_WCF_METAFILEPICT, import_metafile, export_metafile }, { 0, CF_SYLK, XATOM_WCF_SYLK, import_data, export_data }, { 0, CF_DIF, XATOM_WCF_DIF, import_data, export_data }, { 0, CF_TIFF, XATOM_WCF_TIFF, import_data, export_data }, @@ -814,24 +811,6 @@ static HANDLE import_image_bmp( Atom type, const void *data, size_t size ) /************************************************************************** - * import_metafile - */ -static HANDLE import_metafile( Atom type, const void *data, size_t size ) -{ - METAFILEPICT *mf; - - if (size < sizeof(METAFILEPICT)) return 0; - if ((mf = GlobalAlloc( GMEM_FIXED, sizeof(METAFILEPICT) ))) - { - memcpy( mf, data, sizeof(METAFILEPICT) ); - mf->hMF = SetMetaFileBitsEx( size - sizeof(METAFILEPICT), - (const BYTE *)data + sizeof(METAFILEPICT) ); - } - return mf; -} - - -/************************************************************************** * import_enhmetafile */ static HANDLE import_enhmetafile( Atom type, const void *data, size_t size ) @@ -1224,32 +1203,6 @@ static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom targ /************************************************************************** - * export_metafile - * - * Export MetaFilePict. - */ -static BOOL export_metafile( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) -{ - METAFILEPICT *src, *dst; - unsigned int size; - - src = GlobalLock( handle ); - size = GetMetaFileBitsEx(src->hMF, 0, NULL); - - dst = HeapAlloc( GetProcessHeap(), 0, size + sizeof(*dst) ); - if (dst) - { - *dst = *src; - GetMetaFileBitsEx( src->hMF, size, dst + 1 ); - } - GlobalUnlock( handle ); - put_property( display, win, prop, target, 8, dst, size + sizeof(*dst) ); - HeapFree( GetProcessHeap(), 0, dst ); - return TRUE; -} - - -/************************************************************************** * export_enhmetafile * * Export EnhMetaFile. diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ae0bc9c..f50b798 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -465,7 +465,6 @@ enum x11drv_atoms XATOM_WCF_ENHMETAFILE, XATOM_WCF_HDROP, XATOM_WCF_LOCALE, - XATOM_WCF_METAFILEPICT, XATOM_WCF_OEMTEXT, XATOM_WCF_PALETTE, XATOM_WCF_PENDATA, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 4391360..e67b4c4 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -176,7 +176,6 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "WCF_ENHMETAFILE", "WCF_HDROP", "WCF_LOCALE", - "WCF_METAFILEPICT", "WCF_OEMTEXT", "WCF_PALETTE", "WCF_PENDATA",

1 0

Huw Davies : riched20: Pass a ME_Paragraph structure to ME_SetParaFormat() .
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 1d27f9151dce55210e653789db42b8bbbc6e6817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d27f9151dce55210e653789d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 27 09:57:18 2016 +0100 riched20: Pass a ME_Paragraph structure to ME_SetParaFormat(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index c762cf0..ebef30c 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -127,12 +127,12 @@ static void ME_UpdateTableFlags(ME_DisplayItem *para) para->member.para.pFmt->wEffects &= ~PFE_TABLE; } -static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFORMAT2 *pFmt) +static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PARAFORMAT2 *pFmt) { PARAFORMAT2 copy; DWORD dwMask; - assert(para->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); + assert(para->pFmt->cbSize == sizeof(PARAFORMAT2)); dwMask = pFmt->dwMask; if (pFmt->cbSize < sizeof(PARAFORMAT)) return FALSE; @@ -141,27 +141,27 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const else dwMask &= PFM_ALL2; - add_undo_set_para_fmt( editor, &para->member.para ); + add_undo_set_para_fmt( editor, para ); - copy = *para->member.para.pFmt; + copy = *para->pFmt; #define COPY_FIELD(m, f) \ if (dwMask & (m)) { \ - para->member.para.pFmt->dwMask |= m; \ - para->member.para.pFmt->f = pFmt->f; \ + para->pFmt->dwMask |= m; \ + para->pFmt->f = pFmt->f; \ } COPY_FIELD(PFM_NUMBERING, wNumbering); COPY_FIELD(PFM_STARTINDENT, dxStartIndent); if (dwMask & PFM_OFFSETINDENT) - para->member.para.pFmt->dxStartIndent += pFmt->dxStartIndent; + para->pFmt->dxStartIndent += pFmt->dxStartIndent; COPY_FIELD(PFM_RIGHTINDENT, dxRightIndent); COPY_FIELD(PFM_OFFSET, dxOffset); COPY_FIELD(PFM_ALIGNMENT, wAlignment); if (dwMask & PFM_TABSTOPS) { - para->member.para.pFmt->cTabCount = pFmt->cTabCount; - memcpy(para->member.para.pFmt->rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(LONG)); + para->pFmt->cTabCount = pFmt->cTabCount; + memcpy(para->pFmt->rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(LONG)); } #define EFFECTS_MASK (PFM_RTLPARA|PFM_KEEP|PFM_KEEPNEXT|PFM_PAGEBREAKBEFORE| \ @@ -170,9 +170,9 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ if (dwMask & EFFECTS_MASK) { - para->member.para.pFmt->dwMask |= dwMask & EFFECTS_MASK; - para->member.para.pFmt->wEffects &= ~HIWORD(dwMask); - para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(dwMask); + para->pFmt->dwMask |= dwMask & EFFECTS_MASK; + para->pFmt->wEffects &= ~HIWORD(dwMask); + para->pFmt->wEffects |= pFmt->wEffects & HIWORD(dwMask); } #undef EFFECTS_MASK @@ -190,11 +190,11 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const COPY_FIELD(PFM_BORDER, wBorderWidth); COPY_FIELD(PFM_BORDER, wBorders); - para->member.para.pFmt->dwMask |= dwMask; + para->pFmt->dwMask |= dwMask; #undef COPY_FIELD - if (memcmp(&copy, para->member.para.pFmt, sizeof(PARAFORMAT2))) - para->member.para.nFlags |= MEPF_REWRAP; + if (memcmp(&copy, para->pFmt, sizeof(PARAFORMAT2))) + para->nFlags |= MEPF_REWRAP; return TRUE; } @@ -551,7 +551,7 @@ BOOL ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) ME_GetSelectionParas(editor, &para, &para_end); do { - ME_SetParaFormat(editor, para, pFmt); + ME_SetParaFormat(editor, &para->member.para, pFmt); if (para == para_end) break; para = para->member.para.next_para;

1 0

Piotr Caban : msvcp120: Add _Cnd_{do_broadcast, register, unregister}_at_thread_exit tests.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: dfb03d6cafcc08fbbcdeabce5ab65ca5703f46f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb03d6cafcc08fbbcdeabce5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 27 13:29:07 2016 +0200 msvcp120: Add _Cnd_{do_broadcast,register,unregister}_at_thread_exit tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 354b2d3..bcc82f7 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -257,6 +257,9 @@ static int (__cdecl *p__Cnd_wait)(_Cnd_t*, _Mtx_t*); static int (__cdecl *p__Cnd_timedwait)(_Cnd_t*, _Mtx_t*, const xtime*); static int (__cdecl *p__Cnd_broadcast)(_Cnd_t*); static int (__cdecl *p__Cnd_signal)(_Cnd_t*); +static void (__cdecl *p__Cnd_register_at_thread_exit)(_Cnd_t*, _Mtx_t*, int*); +static void (__cdecl *p__Cnd_unregister_at_thread_exit)(_Mtx_t*); +static void (__cdecl *p__Cnd_do_broadcast_at_thread_exit)(void); /* _Pad */ typedef void (*vtable_ptr)(void); @@ -513,6 +516,12 @@ static BOOL init(void) "_Cnd_broadcast"); SET(p__Cnd_signal, "_Cnd_signal"); + SET(p__Cnd_register_at_thread_exit, + "_Cnd_register_at_thread_exit"); + SET(p__Cnd_unregister_at_thread_exit, + "_Cnd_unregister_at_thread_exit"); + SET(p__Cnd_do_broadcast_at_thread_exit, + "_Cnd_do_broadcast_at_thread_exit"); hdll = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(hdll, "setlocale"); @@ -1885,10 +1894,36 @@ static void test_cnd(void) ok(!r, "failed to signal\n"); p__Thrd_join(threads[0], NULL); + /* test _Cnd_do_broadcast_at_thread_exit */ + cm.started = 0; + cm.timed_wait = FALSE; + p__Thrd_create(&threads[0], cnd_wait_thread, (void*)&cm); + + WaitForSingleObject(cm.initialized, INFINITE); + p__Mtx_lock(&mtx); + + r = 0xcafe; + p__Cnd_unregister_at_thread_exit((_Mtx_t*)0xdeadbeef); + p__Cnd_register_at_thread_exit(&cnd, &mtx, &r); + ok(r == 0xcafe, "r = %x\n", r); + p__Cnd_register_at_thread_exit(&cnd, &mtx, &r); + p__Cnd_unregister_at_thread_exit(&mtx); + p__Cnd_do_broadcast_at_thread_exit(); + ok(mtx->count == 1, "mtx.count = %d\n", mtx->count); + + p__Cnd_register_at_thread_exit(&cnd, &mtx, &r); + ok(r == 0xcafe, "r = %x\n", r); + + p__Cnd_do_broadcast_at_thread_exit(); + ok(r == 1, "r = %x\n", r); + p__Thrd_join(threads[0], NULL); + + /* crash if _Cnd_do_broadcast_at_thread_exit is called on exit */ + p__Cnd_register_at_thread_exit((_Cnd_t*)0xdeadbeef, (_Mtx_t*)0xdeadbeef, (int*)0xdeadbeef); + /* test _Cnd_broadcast */ cm.started = 0; cm.thread_no = NUM_THREADS; - cm.timed_wait = FALSE; for(i = 0; i < cm.thread_no; i++) p__Thrd_create(&threads[i], cnd_wait_thread, (void*)&cm);

1 0

Piotr Caban : msvcp140: Introduce _Mbstatet structure.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 3b62083443c419d96692985368ff527bbfd98050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b62083443c419d9669298536… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 27 09:32:51 2016 +0200 msvcp140: Introduce _Mbstatet structure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 297 +++++++++++++++++++++++++++---------------------- dlls/msvcp90/locale.c | 105 +++++++++-------- dlls/msvcp90/msvcp90.h | 23 +++- 3 files changed, 235 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b62083443c419d966929…

1 0

Matteo Bruni : wined3d: Fix doublebuffer mode trace.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: b877d4177fc1a2cefaef59a31150c30d13f7690b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b877d4177fc1a2cefaef59a31… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 27 00:04:14 2016 +0200 wined3d: Fix doublebuffer mode trace. 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/buffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b927105..b50132a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1308,10 +1308,10 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING || pool == WINED3D_POOL_MANAGED) { - /* SWvp always returns the same pointer in buffer maps and retains data in DISCARD maps. - * Keep a system memory copy of the buffer to provide the same behavior to the application. - * Still use a VBO to support OpenGL 3 core contexts. */ - TRACE("Using doublebuffer mode because of software vertex processing.\n"); + /* SWvp and managed buffers always return the same pointer in buffer + * maps and retain data in DISCARD maps. Keep a system memory copy of + * the buffer to provide the same behavior to the application. */ + TRACE("Using doublebuffer mode.\n"); buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; }

1 0

Matteo Bruni : wined3d: Use round() on core profile.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 2b8766310ff3d1be7d55e2e258b7e1d27d0b0e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8766310ff3d1be7d55e2e25… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 27 00:04:11 2016 +0200 wined3d: Use round() 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 | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1c37e1c..e2d624a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -315,15 +315,34 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) } } -static const char *shader_glsl_get_version(const struct wined3d_gl_info *gl_info, +static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_version *version) { if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - return "#version 150"; + return 150; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version && version->major >= 4) - return "#version 130"; + return 130; else - return "#version 120"; + return 120; +} + +static const char *shader_glsl_get_version_declaration(const struct wined3d_gl_info *gl_info, + const struct wined3d_shader_version *version) +{ + unsigned int glsl_version; + + switch (glsl_version = shader_glsl_get_version(gl_info, version)) + { + case 150: + return "#version 150"; + case 130: + return "#version 130"; + case 120: + return "#version 120"; + default: + FIXME("Unexpected GLSL version %u requested.\n", glsl_version); + return ""; + } } static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values) @@ -3400,12 +3419,12 @@ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "int(floor(%s)));\n", src0_param.param_str); } } - else if(ins->handler_idx == WINED3DSIH_MOVA) + else if (ins->handler_idx == WINED3DSIH_MOVA) { - /* We need to *round* to the nearest int here. */ + const struct wined3d_shader_version *version = &ins->ctx->shader->reg_maps.shader_version; unsigned int mask_size = shader_glsl_get_write_mask_size(write_mask); - if (gl_info->supported[EXT_GPU_SHADER4]) + if (shader_glsl_get_version(gl_info, version) >= 130 || gl_info->supported[EXT_GPU_SHADER4]) { if (mask_size > 1) shader_addline(buffer, "ivec%d(round(%s)));\n", mask_size, src0_param.param_str); @@ -5615,7 +5634,7 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl string_buffer_clear(buffer); - shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &vs->reg_maps.shader_version)); + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &vs->reg_maps.shader_version)); if (per_vertex_point_size) { @@ -5867,7 +5886,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context priv_ctx.cur_np2fixup_info = np2fixup_info; priv_ctx.string_buffers = string_buffers; - shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DERIVATIVE_CONTROL]) @@ -5986,7 +6005,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context /* Create the hw GLSL shader program and assign it as the shader->prgId */ GLuint shader_id = GL_EXTCALL(glCreateShader(GL_VERTEX_SHADER)); - shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DRAW_INSTANCED]) @@ -6073,7 +6092,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_id = GL_EXTCALL(glCreateShader(GL_GEOMETRY_SHADER)); - shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_GEOMETRY_SHADER4]) @@ -6512,7 +6531,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr string_buffer_clear(buffer); - shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL)); + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, NULL)); if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); @@ -7074,7 +7093,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } lowest_disabled_stage = stage; - shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL)); + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, NULL)); if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n");

1 0

Alexandre Julliard : winex11: Always go through Unicode for clipboard strings.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: aa4b29b9bc4a7f9a5dcf46e63417fd7081f258d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4b29b9bc4a7f9a5dcf46e63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 27 21:36:13 2016 +0900 winex11: Always go through Unicode for clipboard strings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 59 +++++++++----------------------------------- 1 file changed, 11 insertions(+), 48 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 9f78e3d..611ecee 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -152,8 +152,10 @@ static const struct EXPORTFUNC export; } builtin_formats[] = { - { 0, CF_TEXT, XA_STRING, import_string, export_string }, - { 0, CF_TEXT, XATOM_text_plain, import_string, export_string }, + { 0, CF_UNICODETEXT, XATOM_UTF8_STRING, import_utf8_string, export_utf8_string }, + { 0, CF_UNICODETEXT, XATOM_COMPOUND_TEXT, import_compound_text, export_compound_text }, + { 0, CF_UNICODETEXT, XA_STRING, import_string, export_string }, + { 0, CF_UNICODETEXT, XATOM_text_plain, import_string, export_string }, { 0, CF_BITMAP, XATOM_WCF_BITMAP, import_data, NULL }, { 0, CF_METAFILEPICT, XATOM_WCF_METAFILEPICT, import_metafile, export_metafile }, { 0, CF_SYLK, XATOM_WCF_SYLK, import_data, export_data }, @@ -165,8 +167,6 @@ static const struct { 0, CF_PENDATA, XATOM_WCF_PENDATA, import_data, export_data }, { 0, CF_RIFF, XATOM_WCF_RIFF, import_data, export_data }, { 0, CF_WAVE, XATOM_WCF_WAVE, import_data, export_data }, - { 0, CF_UNICODETEXT, XATOM_UTF8_STRING, import_utf8_string, export_utf8_string }, - { 0, CF_UNICODETEXT, XATOM_COMPOUND_TEXT, import_compound_text, export_compound_text }, { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_enhmetafile, export_enhmetafile }, { 0, CF_HDROP, XATOM_text_uri_list, import_text_uri_list, export_hdrop }, { 0, CF_LOCALE, XATOM_WCF_LOCALE, import_data, export_data }, @@ -683,32 +683,11 @@ static HANDLE unicode_text_from_string( UINT codepage, const void *data, size_t /************************************************************************** * import_string * - * Import XA_STRING, converting the string to CF_TEXT. + * Import XA_STRING, converting the string to CF_UNICODETEXT. */ static HANDLE import_string( Atom type, const void *data, size_t size ) { - const char *lpdata = data; - LPSTR lpstr; - size_t i, inlcount = 0; - - for (i = 0; i < size; i++) - { - if (lpdata[i] == '\n') - inlcount++; - } - - if ((lpstr = GlobalAlloc( GMEM_FIXED, size + inlcount + 1 ))) - { - for (i = 0, inlcount = 0; i < size; i++) - { - if (lpdata[i] == '\n') - lpstr[inlcount++] = '\r'; - - lpstr[inlcount++] = lpdata[i]; - } - lpstr[inlcount] = 0; - } - return lpstr; + return unicode_text_from_string( 28591, data, size ); } @@ -1130,32 +1109,16 @@ static char *string_from_unicode_text( UINT codepage, HANDLE handle, UINT *size /************************************************************************** * export_string * - * Export CF_TEXT converting the string to XA_STRING. + * Export CF_UNICODETEXT converting the string to XA_STRING. */ static BOOL export_string( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) { - UINT i, j; UINT size; - LPSTR text, lpstr = NULL; - - text = GlobalLock( handle ); - size = strlen(text); + char *text = string_from_unicode_text( 28591, handle, &size ); - /* remove carriage returns */ - lpstr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size + 1); - if (lpstr == NULL) - { - GlobalUnlock( handle ); - return FALSE; - } - for (i = 0,j = 0; i < size && text[i]; i++) - { - if (text[i] == '\r' && (text[i+1] == '\n' || text[i+1] == '\0')) - continue; - lpstr[j++] = text[i]; - } - put_property( display, win, prop, target, 8, lpstr, j ); - HeapFree( GetProcessHeap(), 0, lpstr ); + if (!text) return FALSE; + put_property( display, win, prop, target, 8, text, size ); + HeapFree( GetProcessHeap(), 0, text ); GlobalUnlock( handle ); return TRUE; }

1 0

Alexandre Julliard : winex11: Add a helper function to export a Unicode string.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 8493fc782b8e183bb0a1b777a791d68d5433b23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8493fc782b8e183bb0a1b777a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 27 21:24:25 2016 +0900 winex11: Add a helper function to export a Unicode string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 97 +++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 56 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 983ee58..9f78e3d 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1095,6 +1095,39 @@ static BOOL export_data( Display *display, Window win, Atom prop, Atom target, H /************************************************************************** + * string_from_unicode_text + * + * Convert CF_UNICODETEXT data to a string in the specified codepage. + */ +static char *string_from_unicode_text( UINT codepage, HANDLE handle, UINT *size ) +{ + UINT i, j; + char *str; + WCHAR *strW = GlobalLock( handle ); + UINT lenW = GlobalSize( handle ) / sizeof(WCHAR); + DWORD len = WideCharToMultiByte( codepage, 0, strW, lenW, NULL, 0, NULL, NULL ); + + if ((str = HeapAlloc( GetProcessHeap(), 0, len ))) + { + WideCharToMultiByte( codepage, 0, strW, lenW, str, len, NULL, NULL); + GlobalUnlock( handle ); + + /* remove carriage returns */ + for (i = j = 0; i < len; i++) + { + if (str[i] == '\r' && (i == len - 1 || str[i + 1] == '\n')) continue; + str[j++] = str[i]; + } + if (j && !str[j - 1]) j--; /* remove trailing null */ + *size = j; + TRACE( "returning %s\n", debugstr_an( str, j )); + } + GlobalUnlock( handle ); + return str; +} + + +/************************************************************************** * export_string * * Export CF_TEXT converting the string to XA_STRING. @@ -1135,38 +1168,12 @@ static BOOL export_string( Display *display, Window win, Atom prop, Atom target, */ static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) { - UINT i, j; UINT size; - LPSTR text, lpstr; - LPWSTR uni_text = GlobalLock( handle ); - - size = WideCharToMultiByte(CP_UTF8, 0, uni_text, -1, NULL, 0, NULL, NULL); - text = HeapAlloc(GetProcessHeap(), 0, size); - if (!text) - { - GlobalUnlock( handle ); - return FALSE; - } + char *text = string_from_unicode_text( CP_UTF8, handle, &size ); - WideCharToMultiByte(CP_UTF8, 0, uni_text, -1, text, size, NULL, NULL); - GlobalUnlock( handle ); - - /* remove carriage returns */ - lpstr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size--); - if (lpstr == NULL) - { - HeapFree(GetProcessHeap(), 0, text); - return FALSE; - } - for (i = 0,j = 0; i < size && text[i]; i++) - { - if (text[i] == '\r' && (text[i+1] == '\n' || text[i+1] == '\0')) - continue; - lpstr[j++] = text[i]; - } - put_property( display, win, prop, target, 8, lpstr, j ); - HeapFree(GetProcessHeap(), 0, lpstr); - HeapFree(GetProcessHeap(), 0, text); + if (!text) return FALSE; + put_property( display, win, prop, target, 8, text, size ); + HeapFree( GetProcessHeap(), 0, text ); GlobalUnlock( handle ); return TRUE; } @@ -1179,47 +1186,25 @@ static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom ta */ static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) { - char* lpstr; XTextProperty textprop; XICCEncodingStyle style; - UINT i, j; UINT size; - LPWSTR uni_text = GlobalLock( handle ); - - size = WideCharToMultiByte(CP_UNIXCP, 0, uni_text, -1, NULL, 0, NULL, NULL); - lpstr = HeapAlloc(GetProcessHeap(), 0, size); - if (!lpstr) - { - GlobalUnlock( handle ); - return FALSE; - } - - WideCharToMultiByte(CP_UNIXCP, 0, uni_text, -1, lpstr, size, NULL, NULL); - - /* remove carriage returns */ - for (i = 0, j = 0; i < size && lpstr[i]; i++) - { - if (lpstr[i] == '\r' && (lpstr[i+1] == '\n' || lpstr[i+1] == '\0')) - continue; - lpstr[j++] = lpstr[i]; - } - lpstr[j]='\0'; - - GlobalUnlock( handle ); + char *text = string_from_unicode_text( CP_UNIXCP, handle, &size ); + if (!text) return FALSE; if (target == x11drv_atom(COMPOUND_TEXT)) style = XCompoundTextStyle; else style = XStdICCTextStyle; /* Update the X property */ - if (XmbTextListToTextProperty( display, &lpstr, 1, style, &textprop ) == Success) + if (XmbTextListToTextProperty( display, &text, 1, style, &textprop ) == Success) { XSetTextProperty( display, win, &textprop, prop ); XFree( textprop.value ); } - HeapFree(GetProcessHeap(), 0, lpstr); + HeapFree( GetProcessHeap(), 0, text ); return TRUE; }

1 0

Alexandre Julliard : winex11: Add a helper function to import a Unicode string.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 1e7878cfa57e40e707356eac2542086ddf8e413a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7878cfa57e40e707356eac2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 27 21:13:07 2016 +0900 winex11: Add a helper function to import a Unicode string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 102 +++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 68 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index d0d301b..983ee58 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -654,6 +654,33 @@ static WCHAR* uri_to_dos(char *encodedURI) /************************************************************************** + * unicode_text_from_string + * + * Convert a string in the specified encoding to CF_UNICODETEXT format. + */ +static HANDLE unicode_text_from_string( UINT codepage, const void *data, size_t size ) +{ + DWORD i, j, count; + WCHAR *strW; + + count = MultiByteToWideChar( codepage, 0, data, size, NULL, 0); + + if (!(strW = GlobalAlloc( GMEM_FIXED, (count * 2 + 1) * sizeof(WCHAR) ))) return 0; + + MultiByteToWideChar( codepage, 0, data, size, strW + count, count ); + for (i = j = 0; i < count; i++) + { + if (strW[i + count] == '\n') strW[j++] = '\r'; + strW[j++] = strW[i + count]; + } + strW[j++] = 0; + GlobalReAlloc( strW, j * sizeof(WCHAR), GMEM_FIXED ); /* release unused space */ + TRACE( "returning %s\n", debugstr_wn( strW, j - 1 )); + return strW; +} + + +/************************************************************************** * import_string * * Import XA_STRING, converting the string to CF_TEXT. @@ -688,55 +715,24 @@ static HANDLE import_string( Atom type, const void *data, size_t size ) /************************************************************************** * import_utf8_string * - * Import XA_UTF8_STRING, converting the string to CF_UNICODE. + * Import XA_UTF8_STRING, converting the string to CF_UNICODETEXT. */ static HANDLE import_utf8_string( Atom type, const void *data, size_t size ) { - const char *lpdata = data; - LPSTR lpstr; - size_t i, inlcount = 0; - WCHAR *textW = NULL; - - for (i = 0; i < size; i++) - { - if (lpdata[i] == '\n') - inlcount++; - } - - if ((lpstr = HeapAlloc( GetProcessHeap(), 0, size + inlcount + 1 ))) - { - UINT count; - - for (i = 0, inlcount = 0; i < size; i++) - { - if (lpdata[i] == '\n') - lpstr[inlcount++] = '\r'; - - lpstr[inlcount++] = lpdata[i]; - } - lpstr[inlcount] = 0; - - count = MultiByteToWideChar(CP_UTF8, 0, lpstr, -1, NULL, 0); - textW = GlobalAlloc( GMEM_FIXED, count * sizeof(WCHAR) ); - if (textW) MultiByteToWideChar( CP_UTF8, 0, lpstr, -1, textW, count ); - HeapFree(GetProcessHeap(), 0, lpstr); - } - return textW; + return unicode_text_from_string( CP_UTF8, data, size ); } /************************************************************************** * import_compound_text * - * Import COMPOUND_TEXT to CF_UNICODE + * Import COMPOUND_TEXT to CF_UNICODETEXT. */ static HANDLE import_compound_text( Atom type, const void *data, size_t size ) { - int i, j; char** srcstr; - int count, lcount; - int srclen, destlen; - WCHAR *deststr; + int count; + HANDLE ret; XTextProperty txtprop; txtprop.value = (BYTE *)data; @@ -746,39 +742,9 @@ static HANDLE import_compound_text( Atom type, const void *data, size_t size ) if (XmbTextPropertyToTextList( thread_display(), &txtprop, &srcstr, &count ) != Success) return 0; if (!count) return 0; - TRACE("Importing %d line(s)\n", count); - - /* Compute number of lines */ - srclen = strlen(srcstr[0]); - for (i = 0, lcount = 0; i <= srclen; i++) - { - if (srcstr[0][i] == '\n') - lcount++; - } - - destlen = MultiByteToWideChar(CP_UNIXCP, 0, srcstr[0], -1, NULL, 0); - - TRACE("lcount = %d, destlen=%d, srcstr %s\n", lcount, destlen, srcstr[0]); - - if ((deststr = GlobalAlloc( GMEM_FIXED, (destlen + lcount + 1) * sizeof(WCHAR) ))) - { - MultiByteToWideChar(CP_UNIXCP, 0, srcstr[0], -1, deststr, destlen); - - if (lcount) - { - for (i = destlen - 1, j = destlen + lcount - 1; i >= 0; i--, j--) - { - deststr[j] = deststr[i]; - - if (deststr[i] == '\n') - deststr[--j] = '\r'; - } - } - } - + ret = unicode_text_from_string( CP_UNIXCP, srcstr[0], strlen(srcstr[0]) + 1 ); XFreeStringList(srcstr); - - return deststr; + return ret; }

1 0

Alexandre Julliard : user32: Enforce null termination of strings added to the clipboard.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 8f24641ff382a646ff5b7b0c59666c9a305b948c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f24641ff382a646ff5b7b0c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 27 20:28:06 2016 +0900 user32: Enforce null termination of strings added to the clipboard. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 42 +++++++++++--- dlls/user32/tests/clipboard.c | 130 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 8 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index a841d7d..9d80813 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -173,6 +173,29 @@ static HANDLE marshal_data( UINT format, HANDLE handle, data_size_t *ret_size ) GlobalUnlock( handle ); return mfbits; } + case CF_UNICODETEXT: + { + WCHAR *ptr; + if (!(size = GlobalSize( handle ))) return 0; + if ((data_size_t)size != size) return 0; + if (!(ptr = GlobalLock( handle ))) return 0; + ptr[(size + 1) / sizeof(WCHAR) - 1] = 0; /* enforce null-termination */ + GlobalUnlock( handle ); + *ret_size = size; + return handle; + } + case CF_TEXT: + case CF_OEMTEXT: + { + char *ptr; + if (!(size = GlobalSize( handle ))) return 0; + if ((data_size_t)size != size) return 0; + if (!(ptr = GlobalLock( handle ))) return 0; + ptr[size - 1] = 0; /* enforce null-termination */ + GlobalUnlock( handle ); + *ret_size = size; + return handle; + } default: if (!(size = GlobalSize( handle ))) return 0; if ((data_size_t)size != size) return 0; @@ -382,9 +405,11 @@ static HANDLE render_synthesized_textA( HANDLE data, UINT format, UINT from ) size = len * sizeof(WCHAR); } - len = WideCharToMultiByte( codepage, 0, src, size / sizeof(WCHAR), NULL, 0, NULL, NULL ); - if ((ret = GlobalAlloc( GMEM_FIXED, len ))) - WideCharToMultiByte( codepage, 0, src, size / sizeof(WCHAR), ret, len, NULL, NULL ); + if ((len = WideCharToMultiByte( codepage, 0, src, size / sizeof(WCHAR), NULL, 0, NULL, NULL ))) + { + if ((ret = GlobalAlloc( GMEM_FIXED, len ))) + WideCharToMultiByte( codepage, 0, src, size / sizeof(WCHAR), ret, len, NULL, NULL ); + } done: HeapFree( GetProcessHeap(), 0, srcW ); @@ -396,16 +421,17 @@ done: static HANDLE render_synthesized_textW( HANDLE data, UINT from ) { char *src; - HANDLE ret; + HANDLE ret = 0; UINT len, size = GlobalSize( data ); UINT codepage = get_format_codepage( get_clipboard_locale(), from ); if (!(src = GlobalLock( data ))) return 0; - len = MultiByteToWideChar( codepage, 0, src, size, NULL, 0 ); - if ((ret = GlobalAlloc( GMEM_FIXED, len * sizeof(WCHAR) ))) - MultiByteToWideChar( codepage, 0, src, size, ret, len ); - + if ((len = MultiByteToWideChar( codepage, 0, src, size, NULL, 0 ))) + { + if ((ret = GlobalAlloc( GMEM_FIXED, len * sizeof(WCHAR) ))) + MultiByteToWideChar( codepage, 0, src, size, ret, len ); + } GlobalUnlock( data ); return ret; } diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 90e1aaa..832eca6 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -2264,6 +2264,130 @@ static void test_GetUpdatedClipboardFormats(void) ok( count == 4, "wrong count %u\n", count ); } +static const struct +{ + char strA[12]; + WCHAR strW[12]; + UINT len; +} test_data[] = +{ + { "foo", {}, 3 }, /* 0 */ + { "foo", {}, 4 }, + { "foo\0bar", {}, 7 }, + { "foo\0bar", {}, 8 }, + { "", {'f','o','o'}, 3 * sizeof(WCHAR) }, + { "", {'f','o','o',0}, 4 * sizeof(WCHAR) }, /* 5 */ + { "", {'f','o','o',0,'b','a','r'}, 7 * sizeof(WCHAR) }, + { "", {'f','o','o',0,'b','a','r',0}, 8 * sizeof(WCHAR) }, + { "", {'f','o','o'}, 1 }, + { "", {'f','o','o'}, 2 }, + { "", {'f','o','o'}, 5 }, /* 10 */ + { "", {'f','o','o',0}, 7 }, + { "", {'f','o','o',0}, 9 }, +}; + +static void test_string_data(void) +{ + UINT i; + BOOL r; + HANDLE data; + char cmd[16]; + char bufferA[12]; + WCHAR bufferW[12]; + + for (i = 0; i < sizeof(test_data) / sizeof(test_data[0]); i++) + { + /* 1-byte Unicode strings crash on Win64 */ +#ifdef _WIN64 + if (!test_data[i].strA[0] && test_data[i].len < sizeof(WCHAR)) continue; +#endif + r = OpenClipboard( 0 ); + ok( r, "gle %d\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + data = GlobalAlloc( GMEM_FIXED, test_data[i].len ); + if (test_data[i].strA[0]) + { + memcpy( data, test_data[i].strA, test_data[i].len ); + SetClipboardData( CF_TEXT, data ); + memcpy( bufferA, test_data[i].strA, test_data[i].len ); + bufferA[test_data[i].len - 1] = 0; + ok( !memcmp( data, bufferA, test_data[i].len ), + "%u: wrong data %.*s\n", i, test_data[i].len, (char *)data ); + } + else + { + memcpy( data, test_data[i].strW, test_data[i].len ); + SetClipboardData( CF_UNICODETEXT, data ); + memcpy( bufferW, test_data[i].strW, test_data[i].len ); + bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; + ok( !memcmp( data, bufferW, test_data[i].len ), + "%u: wrong data %s\n", i, wine_dbgstr_wn( data, (test_data[i].len + 1) / sizeof(WCHAR) )); + } + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + sprintf( cmd, "string_data %u", i ); + run_process( cmd ); + } +} + +static void test_string_data_process( int i ) +{ + BOOL r; + HANDLE data; + UINT len, len2; + char bufferA[12]; + WCHAR bufferW[12]; + + r = OpenClipboard( 0 ); + ok( r, "gle %d\n", GetLastError() ); + if (test_data[i].strA[0]) + { + data = GetClipboardData( CF_TEXT ); + ok( data != 0, "%u: could not get data\n", i ); + len = GlobalSize( data ); + ok( len == test_data[i].len, "%u: wrong size %u / %u\n", i, len, test_data[i].len ); + memcpy( bufferA, test_data[i].strA, test_data[i].len ); + bufferA[test_data[i].len - 1] = 0; + ok( !memcmp( data, bufferA, len ), "%u: wrong data %.*s\n", i, len, (char *)data ); + data = GetClipboardData( CF_UNICODETEXT ); + ok( data != 0, "%u: could not get data\n", i ); + len = GlobalSize( data ); + len2 = MultiByteToWideChar( CP_ACP, 0, bufferA, test_data[i].len, bufferW, 12 ); + ok( len == len2 * sizeof(WCHAR), "%u: wrong size %u / %u\n", i, len, len2 ); + ok( !memcmp( data, bufferW, len ), "%u: wrong data %s\n", i, wine_dbgstr_wn( data, len2 )); + } + else + { + data = GetClipboardData( CF_UNICODETEXT ); + ok( data != 0, "%u: could not get data\n", i ); + len = GlobalSize( data ); + ok( len == test_data[i].len, "%u: wrong size %u / %u\n", i, len, test_data[i].len ); + memcpy( bufferW, test_data[i].strW, test_data[i].len ); + bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; + ok( !memcmp( data, bufferW, len ), + "%u: wrong data %s\n", i, wine_dbgstr_wn( data, (len + 1) / sizeof(WCHAR) )); + data = GetClipboardData( CF_TEXT ); + if (test_data[i].len >= sizeof(WCHAR)) + { + ok( data != 0, "%u: could not get data\n", i ); + len = GlobalSize( data ); + len2 = WideCharToMultiByte( CP_ACP, 0, bufferW, test_data[i].len / sizeof(WCHAR), + bufferA, 12, NULL, NULL ); + bufferA[len2 - 1] = 0; + ok( len == len2, "%u: wrong size %u / %u\n", i, len, len2 ); + ok( !memcmp( data, bufferA, len ), "%u: wrong data %.*s\n", i, len, (char *)data ); + } + else + { + ok( !data, "%u: got data for empty string\n", i ); + ok( IsClipboardFormatAvailable( CF_TEXT ), "%u: text not available\n", i ); + } + } + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); +} + START_TEST(clipboard) { char **argv; @@ -2301,6 +2425,11 @@ START_TEST(clipboard) test_handles_process_dib( argv[3] ); return; } + if (argc == 4 && !strcmp( argv[2], "string_data" )) + { + test_string_data_process( atoi( argv[3] )); + return; + } test_RegisterClipboardFormatA(); test_ClipboardOwner(); @@ -2308,4 +2437,5 @@ START_TEST(clipboard) test_messages(); test_data_handles(); test_GetUpdatedClipboardFormats(); + test_string_data(); }

1 0