June 2014 - Wine-Commits - list.winehq.org

Akihiro Sagawa : winmm: Fix SEEK_END handling for memory files.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 8d9a7247c385753559989ae68755c1402824f80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9a7247c385753559989ae68… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:28 2014 +0900 winmm: Fix SEEK_END handling for memory files. --- dlls/winmm/mmio.c | 2 +- dlls/winmm/tests/mmio.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index ec282c2..c61c99c 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -896,7 +896,7 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) /* some memory mapped buffers are defined with -1 as a size */ if ((wm->info.cchBuffer > 0) && ((offset < wm->info.lBufOffset) || - (offset >= wm->info.lBufOffset + wm->info.cchBuffer) || + (offset > wm->info.lBufOffset + wm->info.cchBuffer) || (offset > wm->dwFileSize && wm->info.fccIOProc != FOURCC_MEM) || !wm->bBufferLoaded)) { diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index be91b41..5e440b8 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -695,7 +695,16 @@ static void test_mmioSeek(void) if (hmmio != NULL) { /* seek to the end */ end = mmioSeek(hmmio, 0, SEEK_END); - todo_wine ok(end == size, "expected %d, got %d\n", size, end); + ok(end == size, "expected %d, got %d\n", size, end); + + /* test MMIOINFO values */ + res = mmioGetInfo(hmmio, &mmio, 0); + ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); + ok(mmio.pchNext == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchNext); + ok(mmio.pchEndRead == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndRead); + ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); + ok(mmio.lBufOffset == 0, "expected %d, got %d\n", 0, mmio.lBufOffset); + ok(mmio.lDiskOffset == 0, "expected %d, got %d\n", 0, mmio.lDiskOffset); /* seek backward from the end */ pos = mmioSeek(hmmio, offset, SEEK_END);

1 0

Akihiro Sagawa : winmm: Update lBufOffset after seeking file directly.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 71b8a56c8413e570ecd382dab3da6b4f8a597d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b8a56c8413e570ecd382dab… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:26 2014 +0900 winmm: Update lBufOffset after seeking file directly. --- dlls/winmm/mmio.c | 8 ++++++-- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index c0e9498..ec282c2 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -871,8 +871,12 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) return MMSYSERR_INVALHANDLE; /* not buffered, direct seek on file */ - if (!wm->info.pchBuffer && wm->info.fccIOProc != FOURCC_MEM) - return send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lOffset, iOrigin, FALSE); + if (!wm->info.pchBuffer && wm->info.fccIOProc != FOURCC_MEM) { + LRESULT ret = send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lOffset, iOrigin, FALSE); + if (ret != -1) + wm->info.lBufOffset = wm->info.lDiskOffset; + return ret; + } switch (iOrigin) { case SEEK_SET: diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e92700f..be91b41 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -725,7 +725,7 @@ static void test_mmioSeek(void) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); - todo_wine ok(mmio.lBufOffset == size, "expected %d, got %d\n", size, mmio.lBufOffset); + ok(mmio.lBufOffset == size, "expected %d, got %d\n", size, mmio.lBufOffset); ok(mmio.lDiskOffset == size, "expected %d, got %d\n", size, mmio.lDiskOffset); /* seek backward from the end */

1 0

Akihiro Sagawa : winmm: Avoid direct seeking for memory files.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: f7ddc1eb957c96bb25bba0887e262ed15f0b8747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ddc1eb957c96bb25bba0887… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:24 2014 +0900 winmm: Avoid direct seeking for memory files. --- dlls/winmm/mmio.c | 2 +- dlls/winmm/tests/mmio.c | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 8521b87..c0e9498 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -871,7 +871,7 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) return MMSYSERR_INVALHANDLE; /* not buffered, direct seek on file */ - if (!wm->info.pchBuffer) + if (!wm->info.pchBuffer && wm->info.fccIOProc != FOURCC_MEM) return send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lOffset, iOrigin, FALSE); switch (iOrigin) { diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 71efc5d..e92700f 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -315,10 +315,7 @@ static void test_mmioOpen(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -531,10 +528,7 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); ret = mmioSetBuffer(hmmio, NULL, 0, MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -554,10 +548,7 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); ret = mmioSetBuffer(hmmio, buf, 0, MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret);

1 0

Henri Verbeet : ddraw/tests: Properly declare matrices.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 9031adfd5c5b246bc89b1d8f7895c5595fdd05d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9031adfd5c5b246bc89b1d8f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 16 13:13:24 2014 +0200 ddraw/tests: Properly declare matrices. --- dlls/ddraw/tests/d3d.c | 37 ++++++++++++++------------ dlls/ddraw/tests/visual.c | 63 ++++++++++++++++++++++++--------------------- 2 files changed, 54 insertions(+), 46 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index be87e63..209555a 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2807,27 +2807,32 @@ static void SetMaterialTest(void) static void ComputeSphereVisibility(void) { - D3DMATRIX proj, view, world; + D3DMATRIX proj = + { + 1.810660f, 0.000000f, 0.000000f, 0.000000f, + 0.000000f, 2.414213f, 0.000000f, 0.000000f, + 0.000000f, 0.000000f, 1.020408f, 1.000000f, + 0.000000f, 0.000000f, -0.102041f, 0.000000f, + }; + D3DMATRIX view = + { + 1.000000f, 0.000000f, 0.000000f, 0.000000f, + 0.000000f, 0.768221f, -0.640185f, 0.000000f, + -0.000000f, 0.640185f, 0.768221f, 0.000000f, + -14.852037f, 9.857489f, 11.600972f, 1.000000f, + }; + D3DMATRIX world = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }; D3DVALUE radius[3]; D3DVECTOR center[3]; DWORD result[3]; HRESULT rc; - world._11=1.0; world._12=0.0; world._13=0.0; world._14=0.0; - world._21=0.0; world._22=1.0; world._23=0.0; world._24=0.0; - world._31=0.0; world._32=0.0; world._33=1.0; world._34=0.0; - world._41=0.0; world._42=0.0; world._43=0.0; world._44=1.0; - - view._11=1.000000; view._12=0.000000; view._13=0.000000; view._14=0.000000; - view._21=0.000000; view._22=0.768221; view._23=-0.640185; view._24=0.000000; - view._31=-0.000000; view._32=0.640185; view._33=0.768221; view._34=0.000000; - view._41=-14.852037; view._42=9.857489; view._43=11.600972; view._44=1.000000; - - proj._11=1.810660; proj._12=0.000000; proj._13=0.00000; proj._14=0.000000; - proj._21=0.000000; proj._22=2.414213; proj._23=0.000000, proj._24=0.000000; - proj._31=0.000000; proj._32=0.000000; proj._33=1.020408, proj._34=1.000000; - proj._41=0.000000; proj._42=0.000000; proj._43=-0.102041; proj._44=0.000000; - IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_WORLD, &world); IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_VIEW , &view); IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_PROJECTION, &proj); diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 109c24c..7aaf7cd 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -290,11 +290,13 @@ static void lighting_test(IDirect3DDevice7 *device) DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; DWORD color; - float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f }; - + D3DMATRIX mat = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }; struct vertex unlitquad[] = { {-1.0f, -1.0f, 0.1f, 0xffff0000}, @@ -329,11 +331,11 @@ static void lighting_test(IDirect3DDevice7 *device) ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); /* Setup some states that may cause issues */ - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *) mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &mat); ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %08x\n", hr); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, (D3DMATRIX *)mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &mat); ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %08x\n", hr); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *) mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &mat); ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %08x\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState returned %08x\n", hr); @@ -491,36 +493,34 @@ static void fog_test(IDirect3DDevice7 *device) {320, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; - - float ident_mat[16] = + D3DMATRIX ident_mat = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f + 0.0f, 0.0f, 0.0f, 1.0f, }; - float world_mat1[16] = + D3DMATRIX world_mat1 = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, -0.5f, 1.0f + 0.0f, 0.0f, -0.5f, 1.0f, }; - float world_mat2[16] = + D3DMATRIX world_mat2 = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 1.0f + 0.0f, 0.0f, 1.0f, 1.0f, }; - float proj_mat[16] = + D3DMATRIX proj_mat = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, -1.0f, 1.0f + 0.0f, 0.0f, -1.0f, 1.0f, }; - struct sVertex far_quad1[] = { {-1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, @@ -625,7 +625,7 @@ static void fog_test(IDirect3DDevice7 *device) if (caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) { /* A simple fog + non-identity world matrix test */ - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)world_mat1); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &world_mat1); ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %#08x\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGTABLEMODE, D3DFOG_LINEAR); @@ -660,9 +660,9 @@ static void fog_test(IDirect3DDevice7 *device) ok(color_match(color, 0x0000ff00, 1), "Fogged out quad has color %08x\n", color); /* Test fog behavior with an orthogonal (but not identity) projection matrix */ - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)world_mat2); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &world_mat2); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *)proj_mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &proj_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); @@ -691,9 +691,9 @@ static void fog_test(IDirect3DDevice7 *device) color = getPixelColor(device, 160, 120); ok(color_match(color, 0x0000ff00, 1), "Fogged out quad has color %08x\n", color); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)ident_mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &ident_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *)ident_mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &ident_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); } else @@ -2230,10 +2230,13 @@ static void D3D3_ViewportClearTest(void) D3DVIEWPORT2 vp_data; DWORD color, red, green, blue; D3DRECT rect; - float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f }; + D3DMATRIX mat = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }; struct vertex quad[] = { {-1.0f, -1.0f, 0.1f, 0xffffffff}, @@ -2335,11 +2338,11 @@ static void D3D3_ViewportClearTest(void) hr = IDirect3DDevice3_BeginScene(Direct3DDevice3); ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); - hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *) mat); + hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_WORLD, &mat); ok(hr == D3D_OK, "IDirect3DDevice3_SetTransform returned %08x\n", hr); - hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_VIEW, (D3DMATRIX *)mat); + hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_VIEW, &mat); ok(hr == D3D_OK, "IDirect3DDevice3_SetTransform returned %08x\n", hr); - hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *) mat); + hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_PROJECTION, &mat); ok(hr == D3D_OK, "IDirect3DDevice3_SetTransform returned %08x\n", hr); hr = IDirect3DDevice3_SetRenderState(Direct3DDevice3, D3DRENDERSTATE_CLIPPING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice3_SetRenderState returned %08x\n", hr);

1 0

Henri Verbeet : ddraw/tests: Get rid of some unused assignments.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: b9bfcf2c2a7ff439e8e30e590eeafc9997e17273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9bfcf2c2a7ff439e8e30e590… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 16 13:13:23 2014 +0200 ddraw/tests: Get rid of some unused assignments. --- dlls/ddraw/tests/ddraw1.c | 14 ++++++-------- dlls/ddraw/tests/ddraw2.c | 18 ++++++++---------- dlls/ddraw/tests/ddraw4.c | 16 +++++++--------- dlls/ddraw/tests/ddraw7.c | 18 ++++++++---------- 4 files changed, 29 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9bfcf2c2a7ff439e8e30…

1 0

Matteo Bruni : wined3d: Validate and handle query size parameter.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: b42fe709d6db16a7f13f708e5a5c9a5d802cabad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42fe709d6db16a7f13f708e5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 13 15:08:51 2014 +0200 wined3d: Validate and handle query size parameter. --- dlls/d3d9/query.c | 5 +++- dlls/d3d9/tests/device.c | 10 +++---- dlls/wined3d/query.c | 73 +++++++++++++++++++++++++--------------------- 3 files changed, 48 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b42fe709d6db16a7f13f7…

1 0

Nikolay Sivov : kernel32: Added a message for WSAECONNRESET.
by Alexandre Julliard June 16, 2014

June 16, 2014

1 0

Bruno Jesus : ws2_32/tests: Wait for thread test before returning ( valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: e3998e39886cbdca012af937b9efe081b83c18a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3998e39886cbdca012af937b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jun 14 14:47:30 2014 -0300 ws2_32/tests: Wait for thread test before returning (valgrind). --- dlls/ws2_32/tests/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fb5ee1d..8a9cbba 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5454,6 +5454,7 @@ static void test_WSARecv(void) send(src, "test message", sizeof("test message"), 0); thread = CreateThread(NULL, 0, recv_thread, &dest, 0, &id); + WaitForSingleObject(thread, 3000); CloseHandle(thread); end:

1 0

Zhenbo Li : mshtml: Added IHTMLTableCell::cellIndex method implementation.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 05f65a9341dedfec77963ed3d59d9a4dfc4edb74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f65a9341dedfec77963ed3d… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Jun 13 07:29:21 2014 +0800 mshtml: Added IHTMLTableCell::cellIndex method implementation. --- dlls/mshtml/htmltablecell.c | 12 ++++++++++-- dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index 7b8d2fc..e023e31 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -268,8 +268,16 @@ static HRESULT WINAPI HTMLTableCell_get_height(IHTMLTableCell *iface, VARIANT *p static HRESULT WINAPI HTMLTableCell_get_cellIndex(IHTMLTableCell *iface, LONG *p) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + nsres = nsIDOMHTMLTableCellElement_GetCellIndex(This->nscell, p); + if (NS_FAILED(nsres)) { + ERR("Get CellIndex failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static const IHTMLTableCellVtbl HTMLTableCellVtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4eb02fc..941e87b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5852,6 +5852,25 @@ static void test_tr_elem(IHTMLElement *elem) IHTMLTableRow_Release(row); } +static void test_td_elem(IHTMLElement *elem) +{ + IHTMLTableCell *cell; + HRESULT hres; + LONG lval; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTableCell, (void**)&cell); + ok(hres == S_OK, "Could not get IHTMLTableRow iface: %08x\n", hres); + if(FAILED(hres)) + return; + + lval = 0xdeadbeef; + hres = IHTMLTableCell_get_cellIndex(cell, &lval); + ok(hres == S_OK, "get cellIndex failed: %08x\n", hres); + ok(lval == 1, "Expected 1, got %d\n", lval); + + IHTMLTableCell_Release(cell); +} + static void test_label_elem(IHTMLElement *elem) { IHTMLLabelElement *label; @@ -6813,6 +6832,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "td2"); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_td_elem(elem); + IHTMLElement_Release(elem); + } + elem = get_doc_elem_by_id(doc, "row2"); ok(elem != NULL, "elem == NULL\n"); if(elem) {

1 0

Nikolay Sivov : windowscodecs/tests: Fixed some leaks on error path ( Valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 7e3ab90187a0e7ccf1bfb0604695a91fb781cb96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3ab90187a0e7ccf1bfb0604… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 00:21:53 2014 +0400 windowscodecs/tests: Fixed some leaks on error path (Valgrind). --- dlls/windowscodecs/tests/metadata.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 7f35c42..e42b474 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -845,7 +845,13 @@ static void test_create_reader(void) stream, &reader); todo_wine ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); - if (FAILED(hr)) return; + /* NOTE: removed once Wine is fixed */ + if (FAILED(hr)) + { + IStream_Release(stream); + IWICComponentFactory_Release(factory); + return; + } if (SUCCEEDED(hr)) {

1 0