October 2012 - Wine-commits

Alexandre Julliard : gdi32/tests: Avoid deleting invalid objects.
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 446bff7897a44d498b5c4025d8232cc436e3de80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=446bff7897a44d498b5c4025d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 20:19:26 2012 +0200 gdi32/tests: Avoid deleting invalid objects. --- dlls/gdi32/tests/bitmap.c | 9 +++------ dlls/gdi32/tests/dib.c | 2 +- dlls/gdi32/tests/metafile.c | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a620361..04c93c1 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3523,7 +3523,6 @@ static void test_GdiAlphaBlend(void) HDC hdcNull; HDC hdcDst; HBITMAP bmpDst; - HBITMAP oldDst; BITMAPINFO *bmi; HDC hdcSrc; HBITMAP bmpSrc; @@ -3553,7 +3552,7 @@ static void test_GdiAlphaBlend(void) bmpSrc = CreateDIBSection(hdcDst, bmi, DIB_RGB_COLORS, &bits, NULL, 0); ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); - oldDst = SelectObject(hdcDst, bmpDst); + SelectObject(hdcDst, bmpDst); oldSrc = SelectObject(hdcSrc, bmpSrc); blend.BlendOp = AC_SRC_OVER; @@ -3736,12 +3735,10 @@ static void test_GdiAlphaBlend(void) ok( !ret, "GdiAlphaBlend succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); - SelectObject(hdcDst, oldDst); - SelectObject(hdcSrc, oldSrc); - DeleteObject(bmpSrc); - DeleteObject(bmpDst); DeleteDC(hdcDst); DeleteDC(hdcSrc); + DeleteObject(bmpSrc); + DeleteObject(bmpDst); ReleaseDC(NULL, hdcNull); diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index b431add..f4ed8e1 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1904,6 +1904,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits) DeleteObject(bmp); SelectObject(hdc, orig_brush); + DeleteObject( dib_brush ); SetBrushOrgEx(hdc, 0, 0, NULL); SetTextColor(hdc, old_text); SetBkColor(hdc, old_bkgnd); @@ -2656,7 +2657,6 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits) SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); - DeleteObject(dib_brush); DeleteObject(solid_brush); DeleteObject(wide_pen); DeleteObject(dashed_pen); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e6bab5d..e4413db 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2489,7 +2489,6 @@ todo_wine hemf = CloseEnhMetaFile(hdc); DeleteEnhMetaFile(hemf); DeleteObject(hrgn); - DeleteDC(hdc); } static const unsigned char MF_CLIP_BITS[] = {

1 0

Alexandre Julliard : user32/tests: Don't release a random DC handle.
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 181e432e22b6231c0b461e52cb6a80b44562d1f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181e432e22b6231c0b461e52c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 20:19:50 2012 +0200 user32/tests: Don't release a random DC handle. --- dlls/user32/tests/dce.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 1aa548e..f75e6b3 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -78,7 +78,7 @@ static void test_dc_attributes(void) old_hdc = hdcs[0]; SetROP2( old_hdc, R2_WHITE ); } - while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + while (i > 0) ReleaseDC( hwnd_cache, hdcs[--i] ); for (i = 0; i < 20; i++) { @@ -91,7 +91,7 @@ static void test_dc_attributes(void) else ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); } - while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + while (i > 0) ReleaseDC( hwnd_cache, hdcs[--i] ); for (i = 0; i < 20; i++) { @@ -107,7 +107,7 @@ static void test_dc_attributes(void) else ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); } - while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + while (i > 0) ReleaseDC( hwnd_cache, hdcs[--i] ); /* test own DC */

1 0

Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_get_register_name().
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 7365f9e6afaa6deb1afaad95388cfbb627f85ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7365f9e6afaa6deb1afaad953… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 18 22:12:49 2012 +0200 wined3d: Explicitly check the shader type in shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a66107c..56c2746 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1319,9 +1319,9 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct wined3d_shader_version *version = &reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; - char pshader = shader_is_pshader_version(reg_maps->shader_version.type); - const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + const char *prefix = shader_glsl_get_prefix(version->type); *is_color = FALSE; @@ -1333,7 +1333,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_INPUT: /* vertex shaders */ - if (!pshader) + if (version->type == WINED3D_SHADER_TYPE_VERTEX) { struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; if (priv->cur_vs_args->swizzle_map & (1 << reg->idx[0].offset)) @@ -1343,10 +1343,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * } /* pixel shaders >= 3.0 */ - if (reg_maps->shader_version.major >= 3) + if (version->major >= 3) { DWORD idx = shader->u.ps.input_reg_map[reg->idx[0].offset]; - unsigned int in_count = vec4_varyings(reg_maps->shader_version.major, gl_info); + unsigned int in_count = vec4_varyings(version->major, gl_info); if (reg->idx[0].rel_addr) { @@ -1432,7 +1432,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_TEXTURE: /* case WINED3DSPR_ADDR: */ - if (pshader) + if (version->type == WINED3D_SHADER_TYPE_PIXEL) sprintf(register_name, "T%u", reg->idx[0].offset); else sprintf(register_name, "A%u", reg->idx[0].offset);

1 0

Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_load_constantsF().
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 0c1dd7f7d121c967e3896a47fd38e4cc37fb16ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1dd7f7d121c967e3896a47f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 18 22:12:50 2012 +0200 wined3d: Explicitly check the shader type in shader_glsl_load_constantsF(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 56c2746..57119e1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -539,7 +539,7 @@ static void shader_glsl_load_constantsF(const struct wined3d_shader *shader, con /* 1.X pshaders have the constants clamped to [-1;1] implicitly. */ if (shader->reg_maps.shader_version.major == 1 - && shader_is_pshader_version(shader->reg_maps.shader_version.type)) + && shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_PIXEL) walk_constant_heap_clamped(gl_info, constants, constant_locations, heap, stack, version); else walk_constant_heap(gl_info, constants, constant_locations, heap, stack, version);

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_ROUND_NI in the GLSL shader backend.
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: b72ab48ed861108f6cedbf9615a1acf82994268e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72ab48ed861108f6cedbf961… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 18 22:12:51 2012 +0200 wined3d: Implement WINED3DSIH_ROUND_NI in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 57119e1..993b547 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2530,6 +2530,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EXP: instruction = "exp2"; break; case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; + case WINED3DSIH_ROUND_NI: instruction = "floor"; break; default: instruction = ""; FIXME("Opcode %#x not yet handled in GLSL\n", ins->handler_idx); break; @@ -5432,7 +5433,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RCP */ shader_glsl_rcp, /* WINED3DSIH_REP */ shader_glsl_rep, /* WINED3DSIH_RET */ shader_glsl_ret, - /* WINED3DSIH_ROUND_NI */ NULL, + /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, /* WINED3DSIH_RSQ */ shader_glsl_rsq, /* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL,

1 0

Henri Verbeet : wined3d: Merge most of the code for shader_glsl_cmp() and shader_glsl_cnd().
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 6beb7dc1a8a7adb9f6a3a213f9428c744944f309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6beb7dc1a8a7adb9f6a3a213f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 18 22:12:52 2012 +0200 wined3d: Merge most of the code for shader_glsl_cmp() and shader_glsl_cnd(). --- dlls/wined3d/glsl_shader.c | 159 +++++++++++++++++++++----------------------- 1 files changed, 77 insertions(+), 82 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 993b547..9ce89b3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2758,79 +2758,100 @@ static void shader_glsl_compare(const struct wined3d_shader_instruction *ins) } } -/** Process CMP instruction in GLSL (dst = src0 >= 0.0 ? src1 : src2), per channel */ -static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) +static void shader_glsl_conditional_move(const struct wined3d_shader_instruction *ins) { + struct wined3d_shader_dst_param dst; struct glsl_src_param src0_param; struct glsl_src_param src1_param; struct glsl_src_param src2_param; - DWORD write_mask, cmp_channel = 0; + BOOL temp_destination = FALSE; + const char *condition_suffix; + DWORD cmp_channel = 0; unsigned int i, j; char mask_char[6]; - BOOL temp_destination = FALSE; + DWORD write_mask; + + switch (ins->handler_idx) + { + case WINED3DSIH_CMP: + condition_suffix = " >= 0.0"; + break; + + case WINED3DSIH_CND: + condition_suffix = " > 0.5"; + break; + + default: + FIXME("Unhandled instruction %#x.\n", ins->handler_idx); + condition_suffix = "<unhandled suffix>"; + break; + } if (shader_is_scalar(&ins->src[0].reg)) { write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_ALL, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); - shader_addline(ins->ctx->buffer, "%s >= 0.0 ? %s : %s);\n", - src0_param.param_str, src1_param.param_str, src2_param.param_str); - } else { - DWORD dst_mask = ins->dst[0].write_mask; - struct wined3d_shader_dst_param dst = ins->dst[0]; - - /* Cycle through all source0 channels */ - for (i=0; i<4; i++) { - write_mask = 0; - /* Find the destination channels which use the current source0 channel */ - for (j=0; j<4; j++) { - if (((ins->src[0].swizzle >> (2 * j)) & 0x3) == i) - { - write_mask |= WINED3DSP_WRITEMASK_0 << j; - cmp_channel = WINED3DSP_WRITEMASK_0 << j; - } - } - dst.write_mask = dst_mask & write_mask; - - /* Splitting the cmp instruction up in multiple lines imposes a problem: - * The first lines may overwrite source parameters of the following lines. - * Deal with that by using a temporary destination register if needed - */ - if ((ins->src[0].reg.idx[0].offset == ins->dst[0].reg.idx[0].offset - && ins->src[0].reg.type == ins->dst[0].reg.type) - || (ins->src[1].reg.idx[0].offset == ins->dst[0].reg.idx[0].offset - && ins->src[1].reg.type == ins->dst[0].reg.type) - || (ins->src[2].reg.idx[0].offset == ins->dst[0].reg.idx[0].offset - && ins->src[2].reg.type == ins->dst[0].reg.type)) - { - write_mask = shader_glsl_get_write_mask(&dst, mask_char); - if (!write_mask) continue; - shader_addline(ins->ctx->buffer, "tmp0%s = (", mask_char); - temp_destination = TRUE; - } else { - write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst); - if (!write_mask) continue; - } + shader_addline(ins->ctx->buffer, "%s%s ? %s : %s);\n", + src0_param.param_str, condition_suffix, + src1_param.param_str, src2_param.param_str); + return; + } - shader_glsl_add_src_param(ins, &ins->src[0], cmp_channel, &src0_param); - shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); - shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); + dst = ins->dst[0]; - shader_addline(ins->ctx->buffer, "%s >= 0.0 ? %s : %s);\n", - src0_param.param_str, src1_param.param_str, src2_param.param_str); + /* Splitting the instruction up in multiple lines imposes a problem: + * The first lines may overwrite source parameters of the following lines. + * Deal with that by using a temporary destination register if needed. */ + if ((ins->src[0].reg.idx[0].offset == dst.reg.idx[0].offset + && ins->src[0].reg.type == dst.reg.type) + || (ins->src[1].reg.idx[0].offset == dst.reg.idx[0].offset + && ins->src[1].reg.type == dst.reg.type) + || (ins->src[2].reg.idx[0].offset == dst.reg.idx[0].offset + && ins->src[2].reg.type == dst.reg.type)) + temp_destination = TRUE; + + /* Cycle through all source0 channels. */ + for (i = 0; i < 4; ++i) + { + write_mask = 0; + /* Find the destination channels which use the current source0 channel. */ + for (j = 0; j < 4; ++j) + { + if (((ins->src[0].swizzle >> (2 * j)) & 0x3) == i) + { + write_mask |= WINED3DSP_WRITEMASK_0 << j; + cmp_channel = WINED3DSP_WRITEMASK_0 << j; + } } + dst.write_mask = ins->dst[0].write_mask & write_mask; - if(temp_destination) { - shader_glsl_get_write_mask(&ins->dst[0], mask_char); - shader_glsl_append_dst(ins->ctx->buffer, ins); - shader_addline(ins->ctx->buffer, "tmp0%s);\n", mask_char); + if (temp_destination) + { + if (!(write_mask = shader_glsl_get_write_mask(&dst, mask_char))) + continue; + shader_addline(ins->ctx->buffer, "tmp0%s = (", mask_char); } + else if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst))) + continue; + + shader_glsl_add_src_param(ins, &ins->src[0], cmp_channel, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); + + shader_addline(ins->ctx->buffer, "%s%s ? %s : %s);\n", + src0_param.param_str, condition_suffix, + src1_param.param_str, src2_param.param_str); } + if (temp_destination) + { + shader_glsl_get_write_mask(&ins->dst[0], mask_char); + shader_glsl_append_dst(ins->ctx->buffer, ins); + shader_addline(ins->ctx->buffer, "tmp0%s);\n", mask_char); + } } /** Process the CND opcode in GLSL (dst = (src0 > 0.5) ? src1 : src2) */ @@ -2838,13 +2859,10 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) * the compare is done per component of src0. */ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) { - struct wined3d_shader_dst_param dst; struct glsl_src_param src0_param; struct glsl_src_param src1_param; struct glsl_src_param src2_param; - DWORD write_mask, cmp_channel = 0; - unsigned int i, j; - DWORD dst_mask; + DWORD write_mask; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); @@ -2865,31 +2883,8 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) } return; } - /* Cycle through all source0 channels */ - dst_mask = ins->dst[0].write_mask; - dst = ins->dst[0]; - for (i=0; i<4; i++) { - write_mask = 0; - /* Find the destination channels which use the current source0 channel */ - for (j=0; j<4; j++) { - if (((ins->src[0].swizzle >> (2 * j)) & 0x3) == i) - { - write_mask |= WINED3DSP_WRITEMASK_0 << j; - cmp_channel = WINED3DSP_WRITEMASK_0 << j; - } - } - - dst.write_mask = dst_mask & write_mask; - write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst); - if (!write_mask) continue; - - shader_glsl_add_src_param(ins, &ins->src[0], cmp_channel, &src0_param); - shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); - shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); - shader_addline(ins->ctx->buffer, "%s > 0.5 ? %s : %s);\n", - src0_param.param_str, src1_param.param_str, src2_param.param_str); - } + shader_glsl_conditional_move(ins); } /** GLSL code generation for WINED3DSIO_MAD: Multiply the first 2 opcodes, then add the last */ @@ -5369,7 +5364,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_BREAKP */ shader_glsl_breakp, /* WINED3DSIH_CALL */ shader_glsl_call, /* WINED3DSIH_CALLNZ */ shader_glsl_callnz, - /* WINED3DSIH_CMP */ shader_glsl_cmp, + /* WINED3DSIH_CMP */ shader_glsl_conditional_move, /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut,

1 0

Henri Verbeet : user32: Implement GetRawInputDeviceInfoW().
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 30f1a611776f5bd94c34c440bd4e6bfd202b3b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f1a611776f5bd94c34c440b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 18 22:12:53 2012 +0200 user32: Implement GetRawInputDeviceInfoW(). --- dlls/user32/input.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 76c05df..9fdc124 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -617,11 +617,73 @@ UINT WINAPI GetRawInputDeviceInfoA(HANDLE hDevice, UINT uiCommand, LPVOID pData, /****************************************************************** * GetRawInputDeviceInfoW (USER32.@) */ -UINT WINAPI GetRawInputDeviceInfoW(HANDLE hDevice, UINT uiCommand, LPVOID pData, PUINT pcbSize) +UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT *data_size) { - FIXME("(hDevice=%p, uiCommand=%d, pData=%p, pcbSize=%p) stub!\n", hDevice, uiCommand, pData, pcbSize); + /* FIXME: Most of this is made up. */ + static const WCHAR keyboard_name[] = {'\\','\\','?','\\','W','I','N','E','_','K','E','Y','B','O','A','R','D',0}; + static const WCHAR mouse_name[] = {'\\','\\','?','\\','W','I','N','E','_','M','O','U','S','E',0}; + static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; + static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; + const WCHAR *name = NULL; + RID_DEVICE_INFO *info; + UINT s; - return 0; + TRACE("device %p, command %u, data %p, data_size %p.\n", device, command, data, data_size); + + if (!data_size || (device != WINE_MOUSE_HANDLE && device != WINE_KEYBOARD_HANDLE)) return ~0U; + + switch (command) + { + case RIDI_DEVICENAME: + if (device == WINE_MOUSE_HANDLE) + { + s = sizeof(mouse_name); + name = mouse_name; + } + else + { + s = sizeof(keyboard_name); + name = keyboard_name; + } + break; + case RIDI_DEVICEINFO: + s = sizeof(*info); + break; + default: + return ~0U; + } + + if (!data) + { + *data_size = s; + return 0; + } + + if (*data_size < s) + { + *data_size = s; + return ~0U; + } + + if (command == RIDI_DEVICENAME) + { + memcpy(data, name, s); + return s; + } + + info = data; + info->cbSize = sizeof(*info); + if (device == WINE_MOUSE_HANDLE) + { + info->dwType = RIM_TYPEMOUSE; + info->u.mouse = mouse_info; + } + else + { + info->dwType = RIM_TYPEKEYBOARD; + info->u.keyboard = keyboard_info; + } + return s; }

1 0

André Hentschel : d3drm: Fix memcpy arguments for matrix transformations (coverity).
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 2a42410e7c104bc8532a39b1fa0e69772b804593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a42410e7c104bc8532a39b1f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 19 00:06:12 2012 +0200 d3drm: Fix memcpy arguments for matrix transformations (coverity). --- dlls/d3drm/frame.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 6cab5fa..e4c7cfc 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -813,7 +813,7 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetTransform(IDirect3DRMFrame2* ifac TRACE("(%p/%p)->(%p)\n", iface, This, return_matrix); - memcpy(&return_matrix[0][0], &This->transform[0][0], sizeof(D3DRMMATRIX4D)); + memcpy(return_matrix, This->transform, sizeof(D3DRMMATRIX4D)); return D3DRM_OK; } @@ -1639,7 +1639,7 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddTransform(IDirect3DRMFrame3* ifac switch (type) { case D3DRMCOMBINE_REPLACE: - memcpy(&This->transform[0][0], &matrix[0][0], sizeof(D3DRMMATRIX4D)); + memcpy(This->transform, matrix, sizeof(D3DRMMATRIX4D)); break; case D3DRMCOMBINE_BEFORE: @@ -1905,7 +1905,7 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetTransform(IDirect3DRMFrame3* ifac if (reference) FIXME("Specifying a frame as the root of the scene different from the current root frame is not supported yet\n"); - memcpy(&return_matrix[0][0], &This->transform[0][0], sizeof(D3DRMMATRIX4D)); + memcpy(return_matrix, This->transform, sizeof(D3DRMMATRIX4D)); return D3DRM_OK; } @@ -2694,7 +2694,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa object->ref = 1; object->scenebackground = D3DCOLOR_ARGB(0xff, 0, 0, 0); - memcpy(&object->transform[0][0], &identity[0][0], sizeof(D3DRMMATRIX4D)); + memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); if (parent) {

1 0

Daniel Lehman : msvcp90: In num_put, use default precision of 6 if 0 and not fixed.
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 9416918a5d32afa26c7cfc1aefd38ac6fc6bcb07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9416918a5d32afa26c7cfc1ae… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 4 09:42:25 2012 -0700 msvcp90: In num_put, use default precision of 6 if 0 and not fixed. --- dlls/msvcp90/locale.c | 23 ++++-- dlls/msvcp90/tests/ios.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9416918a5d32afa26c7cf…

1 0

Daniel Lehman : msvcp: Sync num_put<> put_double.
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 9fb5f9e96535e3f51bea34b402f1bdbb6f938081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb5f9e96535e3f51bea34b40… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 18 14:27:01 2012 -0700 msvcp: Sync num_put<> put_double. --- dlls/msvcp100/locale.c | 17 +++++++++++++---- dlls/msvcp60/locale.c | 17 +++++++++++++---- dlls/msvcp71/locale.c | 17 +++++++++++++---- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 5c2d05c..2ae74e0 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -6071,6 +6071,11 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v); } +static inline streamsize get_precision(const ios_base *base) +{ + return base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec; +} + /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DN(a)Z */ /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DN(a)Z */ /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DO(a)Z */ @@ -6088,11 +6093,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; + streamsize prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); num_put_char__Ffmt(this, fmt, '\0', base->fmtfl); - size = _scprintf(fmt, base->prec, v); + prec = get_precision(base); + size = _scprintf(fmt, prec, v); /* TODO: don't use dynamic allocation */ tmp = MSVCRT_operator_new(size*2); @@ -6100,7 +6107,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v)); + num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v)); MSVCRT_operator_delete(tmp); return ret; } @@ -6907,11 +6914,13 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; + streamsize prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); num_put_wchar__Ffmt(this, fmt, '\0', base->fmtfl); - size = _scprintf(fmt, base->prec, v); + prec = get_precision(base); + size = _scprintf(fmt, prec, v); /* TODO: don't use dynamic allocation */ tmp = MSVCRT_operator_new(size*2); @@ -6919,7 +6928,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v), + num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v), numpunct_short_use_facet(base->loc)); MSVCRT_operator_delete(tmp); return ret; diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 2fc9bd0..72b994b 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -6136,6 +6136,11 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v); } +static inline streamsize get_precision(const ios_base *base) +{ + return base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec; +} + /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DN(a)Z */ /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DN(a)Z */ /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DO(a)Z */ @@ -6153,11 +6158,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; + streamsize prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); num_put_char__Ffmt(this, fmt, '\0', base->fmtfl); - size = _scprintf(fmt, base->prec, v); + prec = get_precision(base); + size = _scprintf(fmt, prec, v); /* TODO: don't use dynamic allocation */ tmp = MSVCRT_operator_new(size*2); @@ -6165,7 +6172,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v)); + num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v)); MSVCRT_operator_delete(tmp); return ret; } @@ -6928,11 +6935,13 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; + streamsize prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); num_put_wchar__Ffmt(this, fmt, '\0', base->fmtfl); - size = _scprintf(fmt, base->prec, v); + prec = get_precision(base); + size = _scprintf(fmt, prec, v); /* TODO: don't use dynamic allocation */ tmp = MSVCRT_operator_new(size*2); @@ -6940,7 +6949,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v), + num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v), numpunct_short_use_facet(base->loc)); MSVCRT_operator_delete(tmp); return ret; diff --git a/dlls/msvcp71/locale.c b/dlls/msvcp71/locale.c index 658cdb8..01abd55 100644 --- a/dlls/msvcp71/locale.c +++ b/dlls/msvcp71/locale.c @@ -6465,6 +6465,11 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v); } +static inline streamsize get_precision(const ios_base *base) +{ + return base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec; +} + /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DN(a)Z */ /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DN(a)Z */ /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DO(a)Z */ @@ -6482,11 +6487,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; + streamsize prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); num_put_char__Ffmt(this, fmt, '\0', base->fmtfl); - size = _scprintf(fmt, base->prec, v); + prec = get_precision(base); + size = _scprintf(fmt, prec, v); /* TODO: don't use dynamic allocation */ tmp = MSVCRT_operator_new(size*2); @@ -6494,7 +6501,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v)); + num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v)); MSVCRT_operator_delete(tmp); return ret; } @@ -7301,11 +7308,13 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; + streamsize prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); num_put_wchar__Ffmt(this, fmt, '\0', base->fmtfl); - size = _scprintf(fmt, base->prec, v); + prec = get_precision(base); + size = _scprintf(fmt, prec, v); /* TODO: don't use dynamic allocation */ tmp = MSVCRT_operator_new(size*2); @@ -7313,7 +7322,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v), + num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v), numpunct_short_use_facet(base->loc)); MSVCRT_operator_delete(tmp); return ret;

1 0