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

Shuai Meng : vbscript: Implemented CSng.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: wine Branch: master Commit: d8135b8243e72a6a1d5db3aac742fe20996baf1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8135b8243e72a6a1d5db3aac… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Fri Jun 13 22:30:29 2014 +0800 vbscript: Implemented CSng. --- dlls/vbscript/global.c | 19 +++++++++++++++-- dlls/vbscript/tests/api.vbs | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 294004b..5160374 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -514,8 +514,23 @@ static HRESULT Global_CDbl(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CSng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_R4); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + + *res = v; + return S_OK; } static HRESULT Global_CStr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2aad761..2cf9bb7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -797,4 +797,52 @@ MyObject.myval = 1.5 Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) +Sub testCSngError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CSng(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CSng(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CSng(Empty) = 0, "CSng(Empty) = " & CSng(Empty)) +Call ok(getVT(CSng(Empty)) = "VT_R4", "getVT(CSng(Empty)) = " & getVT(CSng(Empty))) +Call ok(CSng(CByte(0)) = 0, "CSng(CByte(0)) = " & CSng(CByte(0))) +Call ok(getVT(CSng(CCur(0))) = "VT_R4", "getVT(CSng(CCur(0))) = " & getVT(CSng(CCur(0)))) +Call ok(CSng(CCur(0)) = 0, "CSng(CCur(0)) = " & CSng(CCur(0))) +Call ok(getVT(CSng(CCur(0))) = "VT_R4", "getVT(CSng(CCur(0))) = " & getVT(CSng(CCur(0)))) +Call ok(CSng(0) = 0, "CSng(0) = " & CSng(0)) +Call ok(getVT(CSng(0)) = "VT_R4", "getVT(CSng(0)) = " & getVT(CSng(0))) +Call ok(CSng(32768) = 32768, "CSng(32768) = " & CSng(32768)) +Call ok(getVT(CSng(32768)) = "VT_R4", "getVT(CSng(32768)) = " & getVT(CSng(32768))) +Call ok(CSng(0.001 * 0.001) = 0.000001, "CSng(0.001 * 0.001) = " & CSng(0.001 * 0.001)) +Call ok(getVT(CSng(0.001 * 0.001)) = "VT_R4", "getVT(CSng(0.001 * 0.001)) = " & getVT(CSng(0.001 * 0.001))) +Call ok(CSng("-1") = -1, "CSng(""-1"") = " & CSng("-1")) +Call ok(getVT(CSng("-1")) = "VT_R4", "getVT(CSng(""-1"")) = " & getVT(CSng("-1"))) +If isEnglishLang Then + Call ok(CSng("-0.5") = -0.5, "CSng(""-0.5"") = " & CSng("-0.5")) + Call ok(getVT(CSng("-0.5")) = "VT_R4", "getVT(CSng(""-0.5"")) = " & getVT(CSng("-0.5"))) +End If +Call testCSngError("", 13, 13) +Call testCSngError("TRUE", 13, 13) +Call testCSngError("FALSE", 13, 13) +Call testCSngError("#TRue#", 13, 13) +Call testCSngError("#fAlSE#", 13, 13) +Call testCSngError(1, 0, 458) +Call ok(CSng(True) = -1, "CSng(True) = " & CSng(True)) +Call ok(getVT(CSng(True)) = "VT_R4", "getVT(CSng(True)) = " & getVT(CSng(True))) +Call ok(CSng(False) = 0, "CSng(False) = " & CSng(False)) +Call ok(getVT(CSng(False)) = "VT_R4", "getVT(CSng(False)) = " & getVT(CSng(False))) +MyObject.myval = 0.1 +Call ok(CSng(MyObject) = 0.1, "CSng(MyObject) = " & CSng(MyObject)) +Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) +MyObject.myval = 0 +Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) +Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 0188c12..56361bf 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -167,6 +167,8 @@ static const char *vt2a(VARIANT *v) return "VT_I2"; case VT_I4: return "VT_I4"; + case VT_R4: + return "VT_R4"; case VT_R8: return "VT_R8"; case VT_CY:

1 0

Henri Verbeet : ddraw/tests: Get rid of some unused assignments.
by Alexandre Julliard 16 Jun '14

16 Jun '14

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

Henri Verbeet : ddraw/tests: Properly declare matrices.
by Alexandre Julliard 16 Jun '14

16 Jun '14

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

Akihiro Sagawa : winmm/tests: Activate some mmioSeek tests with todo_wine keyword.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: wine Branch: master Commit: 09a1f81cb4edfda01fdbc2367d37adfd902f7983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a1f81cb4edfda01fdbc2367… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:21 2014 +0900 winmm/tests: Activate some mmioSeek tests with todo_wine keyword. --- dlls/winmm/tests/mmio.c | 59 ++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 05e8952..0853b8f 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -314,10 +314,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -345,10 +346,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -405,10 +407,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -436,10 +439,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -532,15 +536,14 @@ static void test_mmioSetBuffer(char *fname) 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, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine 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); @@ -556,15 +559,14 @@ static void test_mmioSetBuffer(char *fname) 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, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine 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); @@ -580,15 +582,11 @@ static void test_mmioSetBuffer(char *fname) 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, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); ok(ret == 0, "expected 0, got %d\n", ret); -#endif ret = mmioSetBuffer(hmmio, NULL, 256, MMIO_WRITE|MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -605,15 +603,14 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", buf, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); }

1 0

Akihiro Sagawa : winmm: Memory file buffer is available even if we just allocate memory.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: wine Branch: master Commit: c4629e5af549e7e30a8573b00d9e420f86e33e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4629e5af549e7e30a8573b00… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:23 2014 +0900 winmm: Memory file buffer is available even if we just allocate memory. --- dlls/winmm/mmio.c | 5 +---- dlls/winmm/tests/mmio.c | 20 ++++---------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index c8f3745..8521b87 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -574,7 +574,7 @@ static MMRESULT MMIO_SetBuffer(WINE_MMIO* wm, void* pchBuffer, LONG cchBuffer, wm->info.pchEndRead = wm->info.pchBuffer; wm->info.pchEndWrite = wm->info.pchBuffer + cchBuffer; wm->info.lBufOffset = wm->info.lDiskOffset; - wm->bBufferLoaded = FALSE; + wm->bBufferLoaded = (wm->info.fccIOProc == FOURCC_MEM); return MMSYSERR_NOERROR; } @@ -660,9 +660,6 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, goto error1; } - if (wm->info.fccIOProc == FOURCC_MEM && !(wm->info.dwFlags & MMIO_ALLOCBUF)) - wm->bBufferLoaded = TRUE; - /* see mmioDosIOProc for that one */ memcpy( wm->info.adwInfo, refmminfo->adwInfo, sizeof(wm->info.adwInfo) ); diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 0853b8f..71efc5d 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -347,10 +347,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); @@ -408,10 +405,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); @@ -440,10 +434,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); @@ -607,10 +598,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); mmioClose(hmmio, 0); }

1 0

Akihiro Sagawa : winmm: Avoid direct seeking for memory files.
by Alexandre Julliard 16 Jun '14

16 Jun '14

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

Akihiro Sagawa : winmm: Update lBufOffset after seeking file directly.
by Alexandre Julliard 16 Jun '14

16 Jun '14

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: Fix SEEK_END handling for memory files.
by Alexandre Julliard 16 Jun '14

16 Jun '14

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

Vincent Povirk : windowscodecs: Support InterlaceOption in PNG encoder.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: wine Branch: master Commit: 3ccaad8b41fe9514b95aa7610a1b33bb745b3c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccaad8b41fe9514b95aa7610… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 28 15:04:00 2014 -0500 windowscodecs: Support InterlaceOption in PNG encoder. --- dlls/windowscodecs/pngformat.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index bd5cd3d..6950c07 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; + static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size) { BYTE header[8]; @@ -1060,6 +1062,7 @@ typedef struct PngEncoder { BOOL frame_committed; BOOL committed; CRITICAL_SECTION lock; + BOOL interlace; } PngEncoder; static inline PngEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) @@ -1111,8 +1114,32 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + BOOL interlace; + PROPBAG2 opts[1]= {{0}}; + VARIANT opt_values[1]; + HRESULT opt_hres[1]; + HRESULT hr; + TRACE("(%p,%p)\n", iface, pIEncoderOptions); + opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; + opts[0].vt = VT_BOOL; + + if (pIEncoderOptions) + { + hr = IPropertyBag2_Read(pIEncoderOptions, 1, opts, NULL, opt_values, opt_hres); + + if (FAILED(hr)) + return hr; + } + else + memset(opt_values, sizeof(opt_values), 0); + + if (V_VT(&opt_values[0]) == VT_EMPTY) + interlace = FALSE; + else + interlace = (V_BOOL(&opt_values[0]) != 0); + EnterCriticalSection(&This->lock); if (This->frame_initialized) @@ -1121,6 +1148,8 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, return WINCODEC_ERR_WRONGSTATE; } + This->interlace = interlace; + This->frame_initialized = TRUE; LeaveCriticalSection(&This->lock); @@ -1259,7 +1288,8 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, if (!This->info_written) { ppng_set_IHDR(This->png_ptr, This->info_ptr, This->width, This->height, - This->format->bit_depth, This->format->color_type, PNG_INTERLACE_NONE, + This->format->bit_depth, This->format->color_type, + This->interlace ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); if (This->xres != 0.0 && This->yres != 0.0) @@ -1548,6 +1578,8 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { PngEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; + PROPBAG2 opts[1]= {{0}}; + TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); EnterCriticalSection(&This->lock); @@ -1564,7 +1596,11 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; + opts[0].vt = VT_BOOL; + opts[0].dwType = PROPBAG2_TYPE_DATA; + + hr = CreatePropertyBag2(opts, 1, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock);

1 0

Nikolay Sivov : wmp: Implement get_versionInfo().
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: wine Branch: master Commit: 99449fc8d41c852aa60da710570e956578665783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99449fc8d41c852aa60da7105… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 09:11:29 2014 +0400 wmp: Implement get_versionInfo(). --- dlls/wmp/Makefile.in | 2 +- dlls/wmp/player.c | 13 ++++++++++--- dlls/wmp/rsrc.rc | 2 ++ dlls/wmp/tests/Makefile.in | 2 +- dlls/wmp/tests/oleobj.c | 14 ++++++++++++++ 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index a82cc36..71ca0e5 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -1,5 +1,5 @@ MODULE = wmp.dll -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 oleaut32 C_SRCS = \ oleobj.c \ diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index e8c349b..4c11c88 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -159,11 +159,18 @@ static HRESULT WINAPI WMPPlayer4_get_playlistCollection(IWMPPlayer4 *iface, IWMP return E_NOTIMPL; } -static HRESULT WINAPI WMPPlayer4_get_versionInfo(IWMPPlayer4 *iface, BSTR *pbstrVersionInfo) +static HRESULT WINAPI WMPPlayer4_get_versionInfo(IWMPPlayer4 *iface, BSTR *version) { + static const WCHAR versionW[] = {'1','2','.','0','.','7','6','0','1','.','1','6','9','8','2',0}; WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, pbstrVersionInfo); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, version); + + if (!version) + return E_POINTER; + + *version = SysAllocString(versionW); + return *version ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI WMPPlayer4_launchURL(IWMPPlayer4 *iface, BSTR url) diff --git a/dlls/wmp/rsrc.rc b/dlls/wmp/rsrc.rc index ced1a64..3585d12 100644 --- a/dlls/wmp/rsrc.rc +++ b/dlls/wmp/rsrc.rc @@ -23,6 +23,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: wmp.rgs */ 2 WINE_REGISTRY wmp.rgs +/* NOTE: when changing version value, update a string returned by + get_versionInfo() as well */ #define WINE_FILEDESCRIPTION_STR "Wine Media Player" #define WINE_FILENAME_STR "wmp.dll" #define WINE_FILEVERSION 12,0,7601,16982 diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index 52da0d7..465b878 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -1,4 +1,4 @@ TESTDLL = wmp.dll -IMPORTS = ole32 user32 +IMPORTS = ole32 oleaut32 user32 C_SRCS = oleobj.c diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 31087f5..875fc77 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -864,12 +864,14 @@ static void test_wmp(void) IOleInPlaceObject *ipobj; IPersistStreamInit *psi; IOleObject *oleobj; + IWMPCore *wmpcore; DWORD misc_status; RECT pos = {0,0,100,100}; HWND hwnd; GUID guid; LONG ref; HRESULT hres; + BSTR str; hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -878,6 +880,18 @@ static void test_wmp(void) } ok(hres == S_OK, "Coult not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + hres = IOleObject_QueryInterface(oleobj, &IID_IWMPCore, (void**)&wmpcore); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = IWMPCore_get_versionInfo(wmpcore, NULL); + ok(hres == E_POINTER, "got 0x%08x\n", hres); + + hres = IWMPCore_get_versionInfo(wmpcore, &str); + ok(hres == S_OK, "got 0x%08x\n", hres); + SysFreeString(str); + + IWMPCore_Release(wmpcore); + hres = IOleObject_QueryInterface(oleobj, &IID_IProvideClassInfo2, (void**)&class_info); ok(hres == S_OK, "Could not get IProvideClassInfo2 iface: %08x\n", hres);

1 0