wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Detlef Riekenberg : winetest: Add option -x to extract all test.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: dc0beeb976d76e1e72365f996cf102482c607a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0beeb976d76e1e72365f996… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 17 22:02:26 2009 +0200 winetest: Add option -x to extract all test. --- programs/winetest/main.c | 56 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 53 insertions(+), 3 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 72b41c6..6cee70c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -769,6 +769,48 @@ static BOOL WINAPI ctrl_handler(DWORD ctrl_type) return FALSE; } + +static BOOL CALLBACK +extract_only_proc (HMODULE hModule, LPCTSTR lpszType, LPTSTR lpszName, LONG_PTR lParam) +{ + const char *target_dir = (const char *)lParam; + char filename[MAX_PATH]; + + if (test_filtered_out( lpszName, NULL )) return TRUE; + + strcpy(filename, lpszName); + CharLowerA(filename); + + extract_test( &wine_tests[nr_of_files], target_dir, filename ); + nr_of_files++; + return TRUE; +} + +static void extract_only (const char *target_dir) +{ + BOOL res; + + report (R_DIR, target_dir); + res = CreateDirectoryA( target_dir, NULL ); + if (!res && GetLastError() != ERROR_ALREADY_EXISTS) + report (R_FATAL, "Could not create directory: %s (%d)", target_dir, GetLastError ()); + + nr_of_files = 0; + report (R_STATUS, "Counting tests"); + if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), EnumTestFileProc, (LPARAM)&nr_of_files)) + report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); + + wine_tests = xmalloc (nr_of_files * sizeof wine_tests[0] ); + + report (R_STATUS, "Extracting tests"); + report (R_PROGRESS, 0, nr_of_files); + nr_of_files = 0; + if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), extract_only_proc, (LPARAM)target_dir)) + report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); + + report (R_DELTA, 0, "Extracting: Done"); +} + static void usage (void) { @@ -783,12 +825,14 @@ usage (void) " -q quiet mode, no output at all\n" " -o FILE put report into FILE, do not submit\n" " -s FILE submit FILE, do not run tests\n" -" -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n"); +" -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n" +" -x DIR Extract tests to DIR (default: .\\wct) and exit\n"); } int main( int argc, char *argv[] ) { char *logname = NULL; + const char *extract = NULL; const char *cp, *submit = NULL; int reset_env = 1; int poweroff = 0; @@ -797,7 +841,7 @@ int main( int argc, char *argv[] ) if (!LoadStringA( 0, IDS_BUILD_ID, build_id, sizeof(build_id) )) build_id[0] = 0; - for (i = 1; argv[i]; i++) + for (i = 1; i < argc && argv[i]; i++) { if (!strcmp(argv[i], "--help")) { usage (); @@ -867,13 +911,19 @@ int main( int argc, char *argv[] ) exit (2); } break; + case 'x': + if (!(extract = argv[++i])) + extract = ".\\wct"; + + extract_only (extract); + break; default: report (R_ERROR, "invalid option: -%c", argv[i][1]); usage (); exit (2); } } - if (!submit) { + if (!submit && !extract) { report (R_STATUS, "Starting up"); if (!running_on_visible_desktop ())

1 0

Detlef Riekenberg : winetest: Add support for --version, --help and /?.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 1f07bc02c1112e763f675df187391c403a4ee711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f07bc02c1112e763f675df18… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 17 16:21:00 2009 +0200 winetest: Add support for --version, --help and /?. --- programs/winetest/main.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index a07e3d9..72b41c6 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -774,14 +774,16 @@ usage (void) { fprintf (stderr, "Usage: winetest [OPTION]... [TESTS]\n\n" -" -c console mode, no GUI\n" -" -e preserve the environment\n" -" -h print this message and exit\n" -" -p shutdown when the tests are done\n" -" -q quiet mode, no output at all\n" -" -o FILE put report into FILE, do not submit\n" -" -s FILE submit FILE, do not run tests\n" -" -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n"); +" --help print this message and exit\n" +" --version print the build version and exit\n" +" -c console mode, no GUI\n" +" -e preserve the environment\n" +" -h print this message and exit\n" +" -p shutdown when the tests are done\n" +" -q quiet mode, no output at all\n" +" -o FILE put report into FILE, do not submit\n" +" -s FILE submit FILE, do not run tests\n" +" -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n"); } int main( int argc, char *argv[] ) @@ -797,7 +799,15 @@ int main( int argc, char *argv[] ) for (i = 1; argv[i]; i++) { - if (argv[i][0] != '-' || argv[i][2]) { + if (!strcmp(argv[i], "--help")) { + usage (); + exit (0); + } + else if (!strcmp(argv[i], "--version")) { + printf("%-12.12s\n", build_id[0] ? build_id : "unknown"); + exit (0); + } + else if ((argv[i][0] != '-' && argv[i][0] != '/') || argv[i][2]) { if (nb_filters == sizeof(filters)/sizeof(filters[0])) { report (R_ERROR, "Too many test filters specified");

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_src_param to shader_glsl_get_swizzle().
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 88c80635c2baf017637df29f1ba7fdb9458db1d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c80635c2baf017637df29f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 09:35:05 2009 +0200 wined3d: Pass a struct wined3d_shader_src_param to shader_glsl_get_swizzle(). --- dlls/wined3d/glsl_shader.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ebf3c57..823097d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1257,12 +1257,13 @@ static void shader_glsl_swizzle_to_str(const DWORD swizzle, BOOL fixup, DWORD ma *str = '\0'; } -static void shader_glsl_get_swizzle(const DWORD param, BOOL fixup, DWORD mask, char *swizzle_str) +static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param, + BOOL fixup, DWORD mask, char *swizzle_str) { - if (shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) + if (shader_is_scalar(param->register_type, param->register_idx)) *swizzle_str = '\0'; else - shader_glsl_swizzle_to_str(param & WINED3DSP_SWIZZLE_MASK, fixup, mask, swizzle_str); + shader_glsl_swizzle_to_str(param->swizzle, fixup, mask, swizzle_str); } /* From a given parameter token, generate the corresponding GLSL string. @@ -1281,7 +1282,7 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i shader_glsl_get_register_name(wined3d_src->register_type, wined3d_src->register_idx, wined3d_src->rel_addr, glsl_src->reg_name, &is_color, ins); - shader_glsl_get_swizzle(wined3d_src->token, is_color, mask, swizzle_str); + shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, glsl_src->param_str); } @@ -2549,7 +2550,7 @@ static void pshader_glsl_texcoord(const struct wined3d_shader_instruction *ins) DWORD src_mod = ins->src[0].modifiers; char dst_swizzle[6]; - shader_glsl_get_swizzle(ins->src[0].token, FALSE, write_mask, dst_swizzle); + shader_glsl_get_swizzle(&ins->src[0], FALSE, write_mask, dst_swizzle); if (src_mod == WINED3DSPSM_DZ) { glsl_src_param_t div_param;

1 0

Henri Verbeet : wined3d: Add a separate function for converting swizzles to strings.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 612c32ea089d94a560f4b1c03a98c966617b9957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=612c32ea089d94a560f4b1c03… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 09:35:05 2009 +0200 wined3d: Add a separate function for converting swizzles to strings. --- dlls/wined3d/glsl_shader.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a0b8c60..ebf3c57 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1240,25 +1240,29 @@ static unsigned int shader_glsl_get_write_mask_size(DWORD write_mask) { return size; } -static void shader_glsl_get_swizzle(const DWORD param, BOOL fixup, DWORD mask, char *swizzle_str) { +static void shader_glsl_swizzle_to_str(const DWORD swizzle, BOOL fixup, DWORD mask, char *str) +{ /* For registers of type WINED3DDECLTYPE_D3DCOLOR, data is stored as "bgra", * but addressed as "rgba". To fix this we need to swap the register's x * and z components. */ - DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; - char *ptr = swizzle_str; + DWORD s = swizzle >> WINED3DSP_SWIZZLE_SHIFT; - if (!shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) - { - *ptr++ = '.'; - /* swizzle bits fields: wwzzyyxx */ - if (mask & WINED3DSP_WRITEMASK_0) *ptr++ = swizzle_chars[swizzle & 0x03]; - if (mask & WINED3DSP_WRITEMASK_1) *ptr++ = swizzle_chars[(swizzle >> 2) & 0x03]; - if (mask & WINED3DSP_WRITEMASK_2) *ptr++ = swizzle_chars[(swizzle >> 4) & 0x03]; - if (mask & WINED3DSP_WRITEMASK_3) *ptr++ = swizzle_chars[(swizzle >> 6) & 0x03]; - } + *str++ = '.'; + /* swizzle bits fields: wwzzyyxx */ + if (mask & WINED3DSP_WRITEMASK_0) *str++ = swizzle_chars[s & 0x03]; + if (mask & WINED3DSP_WRITEMASK_1) *str++ = swizzle_chars[(s >> 2) & 0x03]; + if (mask & WINED3DSP_WRITEMASK_2) *str++ = swizzle_chars[(s >> 4) & 0x03]; + if (mask & WINED3DSP_WRITEMASK_3) *str++ = swizzle_chars[(s >> 6) & 0x03]; + *str = '\0'; +} - *ptr = '\0'; +static void shader_glsl_get_swizzle(const DWORD param, BOOL fixup, DWORD mask, char *swizzle_str) +{ + if (shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) + *swizzle_str = '\0'; + else + shader_glsl_swizzle_to_str(param & WINED3DSP_SWIZZLE_MASK, fixup, mask, swizzle_str); } /* From a given parameter token, generate the corresponding GLSL string. @@ -1535,7 +1539,7 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const struct wined3d_s BOOL np2_fixup = FALSE; va_list args; - shader_glsl_get_swizzle(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); + shader_glsl_swizzle_to_str(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version)) {

1 0

Henri Verbeet : wined3d: Store the source swizzle in struct wined3d_shader_src_param.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: db5ab97125396de5723ef2941b811f76913aa4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5ab97125396de5723ef2941… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 09:35:05 2009 +0200 wined3d: Store the source swizzle in struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 8 ++++---- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9cd8d64..6648c61 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1075,9 +1075,9 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) * with more than one component. Thus replicate the first source argument over all * 4 components. For example, .xyzw -> .x (or better: .xxxx), .zwxy -> .z, etc) */ struct wined3d_shader_src_param tmp_src = ins->src[0]; - tmp_src.token &= ~WINED3DSP_SWIZZLE_MASK; - tmp_src.token |= ((ins->src[0].token >> WINED3DSP_SWIZZLE_SHIFT) & 0x3) + tmp_src.swizzle = ((ins->src[0].swizzle >> WINED3DSP_SWIZZLE_SHIFT) & 0x3) * (0x55 << WINED3DSP_SWIZZLE_SHIFT); + tmp_src.token = (tmp_src.token & ~WINED3DSP_SWIZZLE_MASK) | tmp_src.swizzle; shader_arb_add_src_param(ins, &tmp_src, src0_param); shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); } @@ -1633,7 +1633,6 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; - DWORD swizzle = (ins->src[0].token & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; const char *instruction; char tmpLine[256]; @@ -1651,7 +1650,8 @@ static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) shader_arb_add_dst_param(ins, &ins->dst[0], tmpLine); /* Destination */ strcat(tmpLine, ","); shader_arb_add_src_param(ins, &ins->src[0], tmpLine); - if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) == swizzle) { + if (ins->src[0].swizzle == WINED3DSP_NOSWIZZLE) + { /* Dx sdk says .x is used if no swizzle is given, but our test shows that * .w is used */ diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 0d41fdc..05cbe9e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -245,6 +245,7 @@ static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_ src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); src->register_idx = param & WINED3DSP_REGNUM_MASK; + src->swizzle = param & WINED3DSP_SWIZZLE_MASK; src->modifiers = param & WINED3DSP_SRCMOD_MASK; src->rel_addr = rel_addr; src->token = param; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f9d63cf..a0b8c60 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1946,7 +1946,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) write_mask = 0; /* Find the destination channels which use the current source0 channel */ for (j=0; j<4; j++) { - if (((ins->src[0].token >> (WINED3DSP_SWIZZLE_SHIFT + 2 * j)) & 0x3) == i) + if (((ins->src[0].swizzle >> (WINED3DSP_SWIZZLE_SHIFT + 2 * j)) & 0x3) == i) { write_mask |= WINED3DSP_WRITEMASK_0 << j; cmp_channel = WINED3DSP_WRITEMASK_0 << j; @@ -2028,7 +2028,7 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) write_mask = 0; /* Find the destination channels which use the current source0 channel */ for (j=0; j<4; j++) { - if (((ins->src[0].token >> (WINED3DSP_SWIZZLE_SHIFT + 2 * j)) & 0x3) == i) + if (((ins->src[0].swizzle >> (WINED3DSP_SWIZZLE_SHIFT + 2 * j)) & 0x3) == i) { write_mask |= WINED3DSP_WRITEMASK_0 << j; cmp_channel = WINED3DSP_WRITEMASK_0 << j; @@ -2469,7 +2469,7 @@ static void pshader_glsl_tex(const struct wined3d_shader_instruction *ins) mask |= sample_function.coord_mask; if (shader_version < WINED3DPS_VERSION(2,0)) swizzle = WINED3DVS_NOSWIZZLE; - else swizzle = ins->src[1].token & WINED3DSP_SWIZZLE_MASK; + else swizzle = ins->src[1].swizzle; /* 1.0-1.3: Use destination register as coordinate source. 1.4+: Use provided coordinate source register. */ @@ -2504,7 +2504,7 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) DWORD sample_flags = WINED3D_GLSL_SAMPLE_LOD; DWORD sampler_type; DWORD sampler_idx; - DWORD swizzle = ins->src[1].token & WINED3DSP_SWIZZLE_MASK; + DWORD swizzle = ins->src[1].swizzle; sampler_idx = ins->src[1].register_idx; sampler_type = ins->ctx->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09f7821..b7bf220 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -465,6 +465,7 @@ struct wined3d_shader_src_param { WINED3DSHADER_PARAM_REGISTER_TYPE register_type; UINT register_idx; + DWORD swizzle; DWORD modifiers; const struct wined3d_shader_src_param *rel_addr; DWORD token;

1 0

Henri Verbeet : wined3d: Explicitly pass the source modifier to shader_glsl_gen_modifier().
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 7f58b906dd3d22a9fff04cfb1c44526cff638e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f58b906dd3d22a9fff04cfb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 09:35:04 2009 +0200 wined3d: Explicitly pass the source modifier to shader_glsl_gen_modifier(). --- dlls/wined3d/glsl_shader.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 636cc4f..f9d63cf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -967,15 +967,12 @@ static const char * const shift_glsl_tab[] = { }; /* Generate a GLSL parameter that does the input modifier computation and return the input register/mask to use */ -static void shader_glsl_gen_modifier ( - const DWORD instr, - const char *in_reg, - const char *in_regswizzle, - char *out_str) { - +static void shader_glsl_gen_modifier(DWORD src_modifier, const char *in_reg, const char *in_regswizzle, char *out_str) +{ out_str[0] = 0; - switch (instr & WINED3DSP_SRCMOD_MASK) { + switch (src_modifier) + { case WINED3DSPSM_DZ: /* Need to handle this in the instructions itself (texld & texcrd). */ case WINED3DSPSM_DW: case WINED3DSPSM_NONE: @@ -1015,7 +1012,7 @@ static void shader_glsl_gen_modifier ( sprintf(out_str, "-abs(%s%s)", in_reg, in_regswizzle); break; default: - FIXME("Unhandled modifier %u\n", (instr & WINED3DSP_SRCMOD_MASK)); + FIXME("Unhandled modifier %u\n", src_modifier); sprintf(out_str, "%s%s", in_reg, in_regswizzle); } } @@ -1281,7 +1278,7 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i wined3d_src->rel_addr, glsl_src->reg_name, &is_color, ins); shader_glsl_get_swizzle(wined3d_src->token, is_color, mask, swizzle_str); - shader_glsl_gen_modifier(wined3d_src->token, glsl_src->reg_name, swizzle_str, glsl_src->param_str); + shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, glsl_src->param_str); } /* From a given parameter token, generate the corresponding GLSL string.

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_src_param to pshader_gen_input_modifier_line( ).
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 644439ff0df0c2cb960a7911a1c5dc03490fc22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=644439ff0df0c2cb960a7911a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 09:35:04 2009 +0200 wined3d: Pass a struct wined3d_shader_src_param to pshader_gen_input_modifier_line(). --- dlls/wined3d/arb_program_shader.c | 77 ++++++++++++++++++------------------- 1 files changed, 37 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=644439ff0df0c2cb960a7…

1 0

Huw Davies : user32/tests: Fix tests on win9x.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 2ec629afd9ac30b9bf1652ef99ab392b9ec2cded URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ec629afd9ac30b9bf1652ef9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 21 10:38:52 2009 +0100 user32/tests: Fix tests on win9x. --- dlls/user32/tests/clipboard.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 51aa852..e2ba2f9 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -244,9 +244,12 @@ static void test_synthesized(void) ok(cf == CF_OEMTEXT, "cf %08x\n", cf); cf = EnumClipboardFormats(cf); - ok(cf == CF_UNICODETEXT, "cf %08x\n", cf); + ok(cf == CF_UNICODETEXT || + broken(cf == CF_METAFILEPICT), /* win9x and winME has no CF_UNICODETEXT */ + "cf %08x\n", cf); - cf = EnumClipboardFormats(cf); + if(cf == CF_UNICODETEXT) + cf = EnumClipboardFormats(cf); ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); cf = EnumClipboardFormats(cf);

1 0

Huw Davies : ole32: Add support for enumerating non-ole clipboard formats.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 08d4352f9bf26cae93b5b15a6d9d7f7964ff1281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d4352f9bf26cae93b5b15a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 15:20:12 2009 +0100 ole32: Add support for enumerating non-ole clipboard formats. --- dlls/ole32/clipboard.c | 86 +++++++++++++++++-------- dlls/ole32/tests/clipboard.c | 148 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 207 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index c28b2f4..7255323 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -132,26 +132,6 @@ static inline DWORD_PTR td_get_offs(ole_priv_data *data, DWORD idx) return (char*)data->entries[idx].fmtetc.ptd - (char*)data; } -/***************************************************************************** - * create_empty_priv_data - * - * Create an empty data structure. The only thing that really matters - * here is setting count and size members. This is used by the enumerator as a - * convenience when there's an empty list. - */ -static HRESULT create_empty_priv_data(ole_priv_data **data) -{ - ole_priv_data *ptr; - - *data = NULL; - ptr = HeapAlloc(GetProcessHeap(), 0, sizeof(*ptr)); - if(!ptr) return E_OUTOFMEMORY; - ptr->size = sizeof(*ptr); - ptr->count = 0; - *data = ptr; - return S_OK; -} - /**************************************************************************** * Consumer snapshot. Represents the state of the ole clipboard * returned by OleGetClipboard(). @@ -939,6 +919,26 @@ end: return hr; } +static DWORD get_tymed_from_nonole_cf(UINT cf) +{ + if(cf >= 0xc000) return TYMED_ISTREAM | TYMED_HGLOBAL; + + switch(cf) + { + case CF_TEXT: + case CF_OEMTEXT: + case CF_UNICODETEXT: + return TYMED_ISTREAM | TYMED_HGLOBAL; + case CF_ENHMETAFILE: + return TYMED_ENHMF; + case CF_METAFILEPICT: + return TYMED_MFPICT; + default: + FIXME("returning TYMED_NULL for cf %04x\n", cf); + return TYMED_NULL; + } +} + /*********************************************************** * get_priv_data * @@ -948,6 +948,7 @@ static HRESULT get_priv_data(ole_priv_data **data) { HGLOBAL handle; HRESULT hr = S_OK; + ole_priv_data *ret = NULL; *data = NULL; @@ -960,24 +961,55 @@ static HRESULT get_priv_data(ole_priv_data **data) DWORD i; /* FIXME: sanity check on size */ - *data = HeapAlloc(GetProcessHeap(), 0, src->size); - if(!*data) + ret = HeapAlloc(GetProcessHeap(), 0, src->size); + if(!ret) { GlobalUnlock(handle); return E_OUTOFMEMORY; } - memcpy(*data, src, src->size); + memcpy(ret, src, src->size); GlobalUnlock(handle); /* Fixup any target device offsets to ptrs */ - for(i = 0; i < (*data)->count; i++) - (*data)->entries[i].fmtetc.ptd = - td_offs_to_ptr(*data, (DWORD_PTR)(*data)->entries[i].fmtetc.ptd); + for(i = 0; i < ret->count; i++) + ret->entries[i].fmtetc.ptd = + td_offs_to_ptr(ret, (DWORD_PTR) ret->entries[i].fmtetc.ptd); } } - if(!*data) hr = create_empty_priv_data(data); + if(!ret) /* Non-ole data */ + { + UINT cf; + DWORD count = 0, idx, size = FIELD_OFFSET(ole_priv_data, entries); + + for(cf = 0; (cf = EnumClipboardFormats(cf)) != 0; count++) + { + char buf[100]; + GetClipboardFormatNameA(cf, buf, sizeof(buf)); + TRACE("\tcf %04x %s\n", cf, buf); + ; + } + TRACE("count %d\n", count); + size += count * sizeof(ret->entries[0]); + + /* There are holes in fmtetc so zero init */ + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if(!ret) return E_OUTOFMEMORY; + ret->size = size; + ret->count = count; + + for(cf = 0, idx = 0; (cf = EnumClipboardFormats(cf)) != 0; idx++) + { + ret->entries[idx].fmtetc.cfFormat = cf; + ret->entries[idx].fmtetc.ptd = NULL; + ret->entries[idx].fmtetc.dwAspect = DVASPECT_CONTENT; + ret->entries[idx].fmtetc.lindex = -1; + ret->entries[idx].fmtetc.tymed = get_tymed_from_nonole_cf(cf); + ret->entries[idx].first_use = 1; + } + } + *data = ret; return hr; } diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 4e5f497..17a30a7 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1163,9 +1163,157 @@ static void test_flushed_getdata(void) OleUninitialize(); } +static HGLOBAL create_text(void) +{ + HGLOBAL h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 5); + char *p = GlobalLock(h); + strcpy(p, "test"); + GlobalUnlock(h); + return h; +} + +static HENHMETAFILE create_emf(void) +{ + const RECT rect = {0, 0, 100, 100}; + HDC hdc = CreateEnhMetaFileA(NULL, NULL, &rect, "HENHMETAFILE Ole Clipboard Test\0Test\0\0"); + ExtTextOutA(hdc, 0, 0, ETO_OPAQUE, &rect, "Test String", strlen("Test String"), NULL); + return CloseEnhMetaFile(hdc); +} + +static void test_nonole_clipboard(void) +{ + HRESULT hr; + BOOL r; + IDataObject *get; + IEnumFORMATETC *enum_fmt; + FORMATETC fmt; + HGLOBAL h, hblob, htext; + HENHMETAFILE emf; + + r = OpenClipboard(NULL); + ok(r, "gle %d\n", GetLastError()); + r = EmptyClipboard(); + ok(r, "gle %d\n", GetLastError()); + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); + + OleInitialize(NULL); + + /* empty clipboard */ + hr = OleGetClipboard(&get); + ok(hr == S_OK, "got %08x\n", hr); + hr = IDataObject_EnumFormatEtc(get, DATADIR_GET, &enum_fmt); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_FALSE, "got %08x\n", hr); + IEnumFORMATETC_Release(enum_fmt); + + IDataObject_Release(get); + + /* set a user defined clipboard type */ + + htext = create_text(); + hblob = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE|GMEM_ZEROINIT, 10); + emf = create_emf(); + + r = OpenClipboard(NULL); + ok(r, "gle %d\n", GetLastError()); + h = SetClipboardData(CF_TEXT, htext); + ok(h == htext, "got %p\n", h); + h = SetClipboardData(cf_onemore, hblob); + ok(h == hblob, "got %p\n", h); + h = SetClipboardData(CF_ENHMETAFILE, emf); + ok(h == emf, "got %p\n", h); + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); + + hr = OleGetClipboard(&get); + ok(hr == S_OK, "got %08x\n", hr); + hr = IDataObject_EnumFormatEtc(get, DATADIR_GET, &enum_fmt); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == CF_TEXT, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == cf_onemore, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == CF_ENHMETAFILE, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == TYMED_ENHMF, "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); /* User32 adds some synthesised formats */ + + todo_wine ok(fmt.cfFormat == CF_LOCALE, "cf %04x\n", fmt.cfFormat); + if(fmt.cfFormat == CF_LOCALE) + { + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + } + + ok(fmt.cfFormat == CF_OEMTEXT, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == CF_UNICODETEXT, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == CF_METAFILEPICT, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == TYMED_MFPICT, "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_FALSE, "got %08x\n", hr); + IEnumFORMATETC_Release(enum_fmt); + + IDataObject_Release(get); + + r = OpenClipboard(NULL); + ok(r, "gle %d\n", GetLastError()); + r = EmptyClipboard(); + ok(r, "gle %d\n", GetLastError()); + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); + + OleUninitialize(); +} + START_TEST(clipboard) { test_set_clipboard(); test_consumer_refs(); test_flushed_getdata(); + test_nonole_clipboard(); }

1 0

Huw Davies : ole32: Don't set cf_dataobject if we're clearing the clipboard .
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 575b0e1435bd7f3069c879f143b524792a44472b URL: http://source.winehq.org/git/wine.git/?a=commit;h=575b0e1435bd7f3069c879f14… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 13:44:27 2009 +0100 ole32: Don't set cf_dataobject if we're clearing the clipboard. --- dlls/ole32/clipboard.c | 3 ++- dlls/ole32/tests/clipboard.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 9397a14..c28b2f4 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1729,7 +1729,8 @@ HRESULT WINAPI OleSetClipboard(IDataObject* data) hr = set_src_dataobject(clipbrd, data); if(FAILED(hr)) goto end; - hr = set_dataobject_format(wnd); + if(data) + hr = set_dataobject_format(wnd); end: diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 51b3a62..4e5f497 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -595,6 +595,21 @@ static void test_enum_fmtetc(IDataObject *src) IDataObject_Release(data); } +static void test_no_cf_dataobject(void) +{ + UINT cf_dataobject = RegisterClipboardFormatA("DataObject"); + UINT cf_ole_priv_data = RegisterClipboardFormatA("Ole Private Data"); + HANDLE h; + OpenClipboard(NULL); + + h = GetClipboardData(cf_dataobject); + ok(!h, "got %p\n", h); + h = GetClipboardData(cf_ole_priv_data); + ok(!h, "got %p\n", h); + + CloseClipboard(); +} + static void test_cf_dataobject(IDataObject *data) { UINT cf = 0; @@ -851,6 +866,7 @@ static void test_set_clipboard(void) ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard, hr = 0x%08x\n", hr); + test_no_cf_dataobject(); test_enum_fmtetc(NULL); ref = IDataObject_Release(data1);

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
67
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 April 2009