April 2012 - Wine-commits - list.winehq.org

Bruno Jesus : ole32: Make sure StgIsStorageILockBytes tests real data.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 2cd2628c7ba43840d26f66070b08244eda181f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd2628c7ba43840d26f66070… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Apr 15 05:07:11 2012 -0300 ole32: Make sure StgIsStorageILockBytes tests real data. --- dlls/ole32/storage32.c | 7 ++++--- dlls/ole32/tests/storage32.c | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f279ee5..f233b61 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7846,15 +7846,16 @@ HRESULT WINAPI StgSetTimes(OLECHAR const *str, FILETIME const *pctime, */ HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt) { - BYTE sig[8]; + BYTE sig[sizeof(STORAGE_magic)]; ULARGE_INTEGER offset; + ULONG read = 0; offset.u.HighPart = 0; offset.u.LowPart = 0; - ILockBytes_ReadAt(plkbyt, offset, sig, sizeof(sig), NULL); + ILockBytes_ReadAt(plkbyt, offset, sig, sizeof(sig), &read); - if (memcmp(sig, STORAGE_magic, sizeof(STORAGE_magic)) == 0) + if (read == sizeof(sig) && memcmp(sig, STORAGE_magic, sizeof(sig)) == 0) return S_OK; return S_FALSE; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b465269..bc0cc25 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -66,6 +66,9 @@ static void test_hglobal_storage_stat(void) r = CreateILockBytesOnHGlobal( NULL, TRUE, &ilb ); ok( r == S_OK, "CreateILockBytesOnHGlobal failed\n"); + r = StgIsStorageILockBytes( ilb ); + ok( r == S_FALSE, "StgIsStorageILockBytes should have failed\n"); + mode = STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE;/*0x1012*/ r = StgCreateDocfileOnILockBytes( ilb, mode, 0, &stg ); ok( r == S_OK, "StgCreateDocfileOnILockBytes failed\n"); @@ -73,6 +76,9 @@ static void test_hglobal_storage_stat(void) r = WriteClassStg( stg, &test_stg_cls ); ok( r == S_OK, "WriteClassStg failed\n"); + r = StgIsStorageILockBytes( ilb ); + ok( r == S_OK, "StgIsStorageILockBytes failed\n"); + memset( &stat, 0, sizeof stat ); r = IStorage_Stat( stg, &stat, 0 );

1 0

André Hentschel : winedbg: Add long branch to Thumb disassembling.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 6a2f3e6cffcbbb605f837952dfd5014b1782397f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a2f3e6cffcbbb605f837952d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 15 13:10:26 2012 +0200 winedbg: Add long branch to Thumb disassembling. --- programs/winedbg/be_arm.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 8600256..3e4d8c5 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -3,7 +3,7 @@ * * Copyright 2000-2003 Marcus Meissner * 2004 Eric Pouech - * 2010, 2011 André Hentschel + * 2010-2012 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -257,7 +257,7 @@ static UINT arm_disasm_coprocdatatrans(UINT inst) return 0; } -static WORD thumb_disasm_hireg(WORD inst) +static WORD thumb_disasm_hireg(WORD inst, ADDRESS64 *addr) { short dst = inst & 0x07; short src = (inst >> 3) & 0x07; @@ -276,7 +276,7 @@ static WORD thumb_disasm_hireg(WORD inst) return 0; } -static WORD thumb_disasm_blocktrans(WORD inst) +static WORD thumb_disasm_blocktrans(WORD inst, ADDRESS64 *addr) { short lrpc = (inst >> 8) & 0x01; short load = (inst >> 11) & 0x01; @@ -302,34 +302,48 @@ static WORD thumb_disasm_blocktrans(WORD inst) return 0; } -static WORD thumb_disasm_swi(WORD inst) +static WORD thumb_disasm_longbl(WORD inst, ADDRESS64 *addr) +{ + WORD inst2; + UINT offset = (inst & 0x07ff) << 12; + + addr->Offset += 2; + inst2 = db_get_inst( memory_to_linear_addr(addr), 2 ); + if (!((inst2 & 0xf800) == 0xf800)) return inst; + + offset += (inst2 & 0x07ff) << 1; + dbg_printf("\tbl\t%08x", offset); + return 0; +} + +static WORD thumb_disasm_swi(WORD inst, ADDRESS64 *addr) { WORD comment = inst & 0x00ff; dbg_printf("\n\tswi\t#%d", comment); return 0; } -static WORD thumb_disasm_nop(WORD inst) +static WORD thumb_disasm_nop(WORD inst, ADDRESS64 *addr) { dbg_printf("\n\tnop"); return 0; } -static WORD thumb_disasm_ldrpcrel(WORD inst) +static WORD thumb_disasm_ldrpcrel(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0xff) << 2; dbg_printf("\n\tldr\tr%u, [pc, #%u]", (inst >> 8) & 0x07, offset); return 0; } -static WORD thumb_disasm_ldrsprel(WORD inst) +static WORD thumb_disasm_ldrsprel(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0xff) << 2; dbg_printf("\n\t%s\tr%u, [sp, #%u]", (inst & 0x0800)?"ldr":"str", (inst >> 8) & 0x07, offset); return 0; } -static WORD thumb_disasm_ldrimm(WORD inst) +static WORD thumb_disasm_ldrimm(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0x07c0) >> 6; dbg_printf("\n\t%s%s\tr%u, [r%u, #%u]", (inst & 0x0800)?"ldr":"str", (inst & 0x1000)?"b":"", @@ -337,7 +351,7 @@ static WORD thumb_disasm_ldrimm(WORD inst) return 0; } -static WORD thumb_disasm_immop(WORD inst) +static WORD thumb_disasm_immop(WORD inst, ADDRESS64 *addr) { WORD op = (inst >> 11) & 0x03; dbg_printf("\n\t%s\tr%u, #%u", tbl_immops_t[op], (inst >> 8) & 0x07, inst & 0xff); @@ -368,12 +382,13 @@ struct inst_thumb16 { WORD mask; WORD pattern; - WORD (*func)(WORD); + WORD (*func)(WORD, ADDRESS64*); }; static const struct inst_thumb16 tbl_thumb16[] = { { 0xfc00, 0x4400, thumb_disasm_hireg }, { 0xf600, 0xb400, thumb_disasm_blocktrans }, + { 0xf800, 0xf000, thumb_disasm_longbl }, { 0xf800, 0x4800, thumb_disasm_ldrpcrel }, { 0xf000, 0x9000, thumb_disasm_ldrsprel }, { 0xe000, 0x6000, thumb_disasm_ldrimm }, @@ -455,7 +470,7 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) } else { - if (!t_ptr->func(tinst)) + if (!t_ptr->func(tinst, addr)) { dbg_printf("\n"); addr->Offset += size;

1 0

Henri Verbeet : d3d10: COM cleanup for the ID3D10EffectVariable interface.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: fa6a8396a0bfcbebc3f431d6af5cfd3bd788013b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6a8396a0bfcbebc3f431d6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 15 18:57:12 2012 +0200 d3d10: COM cleanup for the ID3D10EffectVariable interface. --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 265 ++++++++++++++++++++++--------------------- 2 files changed, 137 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa6a8396a0bfcbebc3f43…

1 0

Henri Verbeet : wined3d: Move the present() back buffer check to the common wined3d_swapchain_present() code.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 3ba95e2f3ea0664de3a6965bb3803914ba611824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba95e2f3ea0664de3a6965bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 15 18:57:13 2012 +0200 wined3d: Move the present() back buffer check to the common wined3d_swapchain_present() code. --- dlls/wined3d/swapchain.c | 27 ++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2674ce6..0e363a5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -145,10 +145,17 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region, flags); + if (!swapchain->back_buffers) + { + WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + wined3d_swapchain_set_window(swapchain, dst_window_override); - return swapchain->swapchain_ops->swapchain_present(swapchain, - src_rect, dst_rect, dirty_region, flags); + swapchain->swapchain_ops->swapchain_present(swapchain, src_rect, dst_rect, dirty_region, flags); + + return WINED3D_OK; } HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, @@ -446,7 +453,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, } } -static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, +static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, const RECT *dst_rect_in, const RGNDATA *dirty_region, DWORD flags) { struct wined3d_surface *back_buffer = swapchain->back_buffers[0]; @@ -461,7 +468,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R { context_release(context); WARN("Invalid context, skipping present.\n"); - return WINED3D_OK; + return; } gl_info = context->gl_info; @@ -685,9 +692,6 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R } context_release(context); - - TRACE("returning\n"); - return WINED3D_OK; } static const struct wined3d_swapchain_ops swapchain_gl_ops = @@ -740,16 +744,11 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r ReleaseDC(window, dst_dc); } -static HRESULT swapchain_gdi_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, +static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, const RECT *dst_rect_in, const RGNDATA *dirty_region, DWORD flags) { struct wined3d_surface *front, *back; - if (!swapchain->back_buffers) - { - WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; - } front = swapchain->front_buffer; back = swapchain->back_buffers[0]; @@ -806,8 +805,6 @@ static HRESULT swapchain_gdi_present(struct wined3d_swapchain *swapchain, const } x11_copy_to_screen(swapchain, NULL); - - return WINED3D_OK; } static const struct wined3d_swapchain_ops swapchain_gdi_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 472c21a..bf99835 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2443,7 +2443,7 @@ struct wined3d_rendertarget_view struct wined3d_swapchain_ops { - HRESULT (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, + void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, const RGNDATA *dirty_region, DWORD flags); };

1 0

Henri Verbeet : wined3d: device_clear_render_targets() never fails.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 49c4623b2fba96aa18f6146fb58783efc868ee14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c4623b2fba96aa18f6146fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 15 18:57:14 2012 +0200 wined3d: device_clear_render_targets() never fails. --- dlls/wined3d/device.c | 14 ++++++-------- dlls/wined3d/surface.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a6443e5..ad30afa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -637,7 +637,7 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context } /* Do not call while under the GL lock. */ -HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb, +void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb, UINT rect_count, const RECT *rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { @@ -673,7 +673,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count { context_release(context); WARN("Invalid context, skipping clear.\n"); - return WINED3D_OK; + return; } if (target) @@ -702,7 +702,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count { context_release(context); WARN("Failed to apply clear state, skipping clear.\n"); - return WINED3D_OK; + return; } ENTER_GL(); @@ -819,8 +819,6 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); - - return WINED3D_OK; } ULONG CDECL wined3d_device_incref(struct wined3d_device *device) @@ -3958,10 +3956,10 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou } wined3d_get_draw_rect(&device->stateBlock->state, &draw_rect); + device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, + &device->fb, rect_count, rects, &draw_rect, flags, color, depth, stencil); - return device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, - &device->fb, rect_count, rects, - &draw_rect, flags, color, depth, stencil); + return WINED3D_OK; } void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 76f5863..a80cab2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6447,8 +6447,9 @@ static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d const RECT draw_rect = {0, 0, dst_surface->resource.width, dst_surface->resource.height}; struct wined3d_fb_state fb = {&dst_surface, NULL}; - return device_clear_render_targets(device, 1, &fb, - 1, dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); + device_clear_render_targets(device, 1, &fb, 1, dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); + + return WINED3D_OK; } /* Do not call while under the GL lock. */ @@ -6458,8 +6459,9 @@ static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, const RECT draw_rect = {0, 0, surface->resource.width, surface->resource.height}; struct wined3d_fb_state fb = {NULL, surface}; - return device_clear_render_targets(device, 0, &fb, - 1, rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); + device_clear_render_targets(device, 0, &fb, 1, rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); + + return WINED3D_OK; } const struct blit_shader ffp_blit = { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bf99835..0a110f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1788,7 +1788,7 @@ struct wined3d_device struct list patches[PATCHMAP_SIZE]; }; -HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb, +void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb, UINT rect_count, const RECT *rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : ddraw/tests: Add a helper function to create a material.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 3f0af44ffbfdca20d8e0a685ea6155847ecd2162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0af44ffbfdca20d8e0a685e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 15 18:57:15 2012 +0200 ddraw/tests: Add a helper function to create a material. --- dlls/ddraw/tests/ddraw1.c | 102 ++++++++++++++------------------------ dlls/ddraw/tests/ddraw2.c | 121 +++++++++++++++------------------------------ 2 files changed, 78 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f0af44ffbfdca20d8e0a…

1 0

Michael Stefaniuc : oleaut32/tests: Compare the correct variants.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: bb83794e2873f50aee3b4f1a8d5fb84a2b1c5e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb83794e2873f50aee3b4f1a8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 21:50:42 2012 +0200 oleaut32/tests: Compare the correct variants. --- dlls/oleaut32/tests/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 06686e0..4f7b843 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1286,7 +1286,7 @@ static void test_marshal_VARIANT(void) next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); - ok(SafeArrayGetDim(V_ARRAY(&v)) == SafeArrayGetDim(V_ARRAY(&v)), "array dims differ\n"); + ok(SafeArrayGetDim(V_ARRAY(&v)) == SafeArrayGetDim(V_ARRAY(&v2)), "array dims differ\n"); SafeArrayGetLBound(V_ARRAY(&v), 1, &bound); SafeArrayGetLBound(V_ARRAY(&v2), 1, &bound2); ok(bound == bound2, "array lbounds differ\n"); @@ -1329,7 +1329,7 @@ static void test_marshal_VARIANT(void) next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); - ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v)), "array dims differ\n"); + ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v2)), "array dims differ\n"); SafeArrayGetLBound(*V_ARRAYREF(&v), 1, &bound); SafeArrayGetLBound(*V_ARRAYREF(&v2), 1, &bound2); ok(bound == bound2, "array lbounds differ\n");

1 0

Michael Stefaniuc : gdi32/tests: Fix typo (comparison with itself).
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 7f293b00e874d51cf155938baebcb1f48c515173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f293b00e874d51cf155938ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 21:57:27 2012 +0200 gdi32/tests: Fix typo (comparison with itself). --- dlls/gdi32/tests/metafile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 0bbf9c3..df263c3 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1640,7 +1640,7 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr eto1 = (EMRPOLYBEZIER16*)emr1; eto2 = (EMRPOLYBEZIER16*)emr2; - diff = eto1->cpts != eto1->cpts; + diff = eto1->cpts != eto2->cpts; if(!diff) diff = memcmp(eto1->apts, eto2->apts, eto1->cpts * sizeof(POINTS)); } @@ -1651,7 +1651,7 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr eto1 = (EMRPOLYBEZIER*)emr1; eto2 = (EMRPOLYBEZIER*)emr2; - diff = eto1->cptl != eto1->cptl; + diff = eto1->cptl != eto2->cptl; if(!diff) diff = memcmp(eto1->aptl, eto2->aptl, eto1->cptl * sizeof(POINTL)); }

1 0

Michael Stefaniuc : ntdll/tests: Avoid casting zero.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 6ea39eed8d2c603a1442828e97840c731a2caffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea39eed8d2c603a1442828e9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 21:58:50 2012 +0200 ntdll/tests: Avoid casting zero. --- dlls/ntdll/tests/rtl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 63bc813..5ba577d 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1154,7 +1154,7 @@ static void test_RtlIpv4AddressToString(void) CHAR buffer[20]; CHAR *res; IN_ADDR ip; - DWORD len; + DWORD_PTR len; if (!pRtlIpv4AddressToStringA) { @@ -1175,7 +1175,7 @@ static void test_RtlIpv4AddressToString(void) res = pRtlIpv4AddressToStringA(&ip, NULL); ok( (res == (char *)~0) || - broken(res == (char *)0 + len), /* XP and w2003 */ + broken(res == (char *)len), /* XP and w2003 */ "got %p (expected ~0)\n", res); if (0) {

1 0

Michael Stefaniuc : riched20/tests: Don't cast NULL to an integer.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 25ed3b9572a3b381887ed8563799aaefbe598a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ed3b9572a3b381887ed8563… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 22:02:17 2012 +0200 riched20/tests: Don't cast NULL to an integer. --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 83c24f8..9347ed7 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6366,7 +6366,7 @@ static void test_format_rect(void) /* Reset to default rect and check how the format rect adjusts to window * resize and how it copes with very small windows */ - SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)NULL); + SendMessageA(hwnd, EM_SETRECT, 0, 0); MoveWindow(hwnd, 0, 0, 100, 30, FALSE); GetClientRect(hwnd, &clientRect);

1 0