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

Henri Verbeet : ddraw/tests: 64-bit ddraw only has DWORD surface pitch alignment in some cases.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 7e33bc7a473578dfbf6c53b2f70b993ca20706e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e33bc7a473578dfbf6c53b2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:27 2014 +0200 ddraw/tests: 64-bit ddraw only has DWORD surface pitch alignment in some cases. --- dlls/ddraw/tests/ddraw1.c | 32 +++++++++++++---------- dlls/ddraw/tests/ddraw2.c | 32 +++++++++++++---------- dlls/ddraw/tests/ddraw4.c | 62 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 62 +++++++++++++++++++++++++-------------------- 4 files changed, 106 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e33bc7a473578dfbf6c5…

1 0

Damjan Jovanovic : winex11.drv: Use the global memory functions to allocate the memory for STGMEDIUM' s hGlobal.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 8e32b5f8870ce9ffa7097c985f328e011513d5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e32b5f8870ce9ffa7097c985… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:21:53 2014 +0200 winex11.drv: Use the global memory functions to allocate the memory for STGMEDIUM's hGlobal. --- dlls/winex11.drv/xdnd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index eb98215..4db938f 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -977,10 +977,11 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetData(IDataObject *dataObject, if (current->cf_win == formatEtc->cfFormat) { pMedium->tymed = TYMED_HGLOBAL; - pMedium->u.hGlobal = HeapAlloc(GetProcessHeap(), 0, current->size); + pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, current->size); if (pMedium->u.hGlobal == NULL) return E_OUTOFMEMORY; - memcpy(pMedium->u.hGlobal, current->data, current->size); + memcpy(GlobalLock(pMedium->u.hGlobal), current->data, current->size); + GlobalUnlock(pMedium->u.hGlobal); pMedium->pUnkForRelease = 0; return S_OK; }

1 0

Henri Verbeet : ddraw: Use wined3d_surface_get_pitch() to calculate dwLinearSize for compressed surfaces.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: e2d9cb69ba9a8b7e4e909ab5a26fb40843f71391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d9cb69ba9a8b7e4e909ab5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:30 2014 +0200 ddraw: Use wined3d_surface_get_pitch() to calculate dwLinearSize for compressed surfaces. --- dlls/ddraw/surface.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 21ca19f..4ffad8f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6120,10 +6120,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s { desc->dwFlags |= DDSD_LINEARSIZE; desc->dwFlags &= ~DDSD_PITCH; - if (wined3d_desc.format == WINED3DFMT_DXT1) - surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight) / 2; - else - surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight); + desc->u1.dwLinearSize = wined3d_surface_get_pitch(wined3d_surface) * ((desc->dwHeight + 3) / 4); } else if (!(desc->dwFlags & DDSD_LPSURFACE)) {

1 0

Henri Verbeet : ddraw: Clear DDSD_LINEARSIZE on uncompressed surfaces.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 64a5dc11bf20b8a4b8a581657912bea3d713598e URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a5dc11bf20b8a4b8a581657… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:28 2014 +0200 ddraw: Clear DDSD_LINEARSIZE on uncompressed surfaces. --- dlls/ddraw/surface.c | 3 ++- dlls/ddraw/tests/ddraw1.c | 4 +++- dlls/ddraw/tests/ddraw2.c | 4 +++- dlls/ddraw/tests/ddraw4.c | 10 +++++++++- dlls/ddraw/tests/ddraw7.c | 10 +++++++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3f230a2..a326404 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6127,6 +6127,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s else if (!(desc->dwFlags & DDSD_LPSURFACE)) { desc->dwFlags |= DDSD_PITCH; + desc->dwFlags &= ~DDSD_LINEARSIZE; desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); } @@ -6147,7 +6148,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s return hr; } - desc->dwFlags &= ~DDSD_LPSURFACE; + desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_LINEARSIZE); } wined3d_surface_incref(wined3d_surface); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index df74488..c5198f5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4522,12 +4522,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DDERR_INVALIDPARAMS, 0, 0, 0 }, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2ca7047..f07a1bd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -5598,12 +5598,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DDERR_INVALIDPARAMS, 0, 0, 0 }, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ec53ae6..b515acc 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6493,6 +6493,8 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DD_OK, @@ -6503,8 +6505,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x0fc, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x0f8, DDERR_INVALIDPARAMS, 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x100, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x3f00, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH | DDSD_LINEARSIZE, 0x100, DD_OK, + DDSD_PITCH, 0x100, 0x100}, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c90d89b..7ed2f00 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6316,6 +6316,8 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DD_OK, @@ -6326,8 +6328,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x0fc, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x0f8, DDERR_INVALIDPARAMS, 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x100, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x3f00, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH | DDSD_LINEARSIZE, 0x100, DD_OK, + DDSD_PITCH, 0x100, 0x100}, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0);

1 0

Shuai Meng : vbscript: Fixed CInt.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 89dd8401b3d11ec57c087862f710c5ca0594188f URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dd8401b3d11ec57c087862f… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jun 2 08:17:54 2014 +0800 vbscript: Fixed CInt. --- dlls/vbscript/global.c | 12 ++++++--- dlls/vbscript/tests/api.vbs | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1eaf377..294004b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -398,18 +398,24 @@ static HRESULT Global_CCur(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - int val; + VARIANT v; HRESULT hres; TRACE("%s\n", debugstr_variant(arg)); assert(args_cnt == 1); - hres = to_int(arg, &val); + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_I2); if(FAILED(hres)) return hres; - return return_int(res, val); + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CLng(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 1ba1cb7..2aad761 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -738,4 +738,63 @@ MyObject.myval = 0 Call ok(CLng(MyObject) = 0, "CLng(MyObject) = " & CLng(MyObject)) Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) +Sub testCIntError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CInt(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CInt(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CInt(Empty) = 0, "CInt(Empty) = " & CInt(Empty)) +Call ok(getVT(CInt(Empty)) = "VT_I2", "getVT(CInt(Empty)) = " & getVT(CInt(Empty))) +Call ok(CInt(CByte(0)) = 0, "CInt(CByte(0)) = " & CInt(CByte(0))) +Call ok(getVT(CInt(CByte(0))) = "VT_I2", "getVT(CInt(CByte(0))) = " & getVT(CInt(CByte(0)))) +Call ok(CInt(CCur(0)) = 0, "CInt(CCur(0)) = " & CInt(CCur(0))) +Call ok(getVT(CInt(CCur(0))) = "VT_I2", "getVT(CInt(CCur(0))) = " & getVT(CInt(CCur(0)))) +Call ok(CInt(0.49) = 0, "CInt(0.49) = " & CInt(0.49)) +Call ok(getVT(CInt(0.49)) = "VT_I2", "getVT(CInt(0.49)) = " & getVT(CInt(0.49))) +Call ok(CInt(0.5) = 0, "CInt(0.5) = " & CInt(0.5)) +Call ok(getVT(CInt(0.5)) = "VT_I2", "getVT(CInt(0.5)) = " & getVT(CInt(0.5))) +Call ok(CInt(0.51) = 1, "CInt(0.51) = " & CInt(0.51)) +Call ok(getVT(CInt(0.51)) = "VT_I2", "getVT(CInt(0.51)) = " & getVT(CInt(0.51))) +Call ok(CInt(1.49) = 1, "CInt(0.49) = " & CInt(0.49)) +Call ok(getVT(CInt(0.49)) = "VT_I2", "getVT(CInt(0.49)) = " & getVT(CInt(0.49))) +Call ok(CInt(1.5) = 2, "CInt(1.5) = " & CInt(1.5)) +Call ok(getVT(CInt(1.5)) = "VT_I2", "getVT(CInt(1.5)) = " & getVT(CInt(1.5))) +Call ok(CInt(1.51) = 2, "CInt(1.51) = " & CInt(1.51)) +Call ok(getVT(CInt(1.51)) = "VT_I2", "getVT(CInt(1.51)) = " & getVT(CInt(1.51))) +Call ok(CInt("-1") = -1, "CInt(""-1"") = " & CInt("-1")) +Call ok(getVT(CInt("-1")) = "VT_I2", "getVT(CInt(""-1"")) = " & getVT(CInt("-1"))) +If isEnglishLang Then + Call ok(CInt("-0.5") = 0, "CInt(""-0.5"") = " & CInt("-0.5")) + Call ok(getVT(CInt("-0.5")) = "VT_I2", "getVT(CInt(""-0.5"")) = " & getVT(CInt("-0.5"))) +End If +Call testCIntError("", 13, 13) +Call testCIntError("-1", 0, 458) +Call testCIntError("TRUE", 13, 13) +Call testCIntError("FALSE", 13, 13) +Call testCIntError("#TRue#", 13, 13) +Call testCIntError("#fAlSE#", 13, 13) +Call testCIntError(1, 0, 458) +Call testCIntError(32767.49, 0, 458) +Call testCIntError(32767.5, 6, 6) +Call testCIntError(-32768.5, 0, 458) +Call testCIntError(-32768.51, 6, 6) +Call ok(CInt(True) = -1, "CInt(True) = " & CInt(True)) +Call ok(getVT(CInt(True)) = "VT_I2", "getVT(CInt(True)) = " & getVT(CInt(True))) +Call ok(CInt(False) = 0, "CInt(False) = " & CInt(False)) +Call ok(getVT(CInt(False)) = "VT_I2", "getVT(CInt(False)) = " & getVT(CInt(False))) +MyObject.myval = 2.5 +Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) +Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) +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))) + Call reportSuccess()

1 0

Shuai Meng : vbscript: Implemented CLng.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: ded01d657e96599bfbc260427a7687602ca4809d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded01d657e96599bfbc260427… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jun 2 08:16:43 2014 +0800 vbscript: Implemented CLng. --- dlls/vbscript/global.c | 20 ++++++++++++++-- dlls/vbscript/tests/api.vbs | 56 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 68b7638..1eaf377 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -414,8 +414,24 @@ static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CLng(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_I4); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CBool(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 c9ae774..1ba1cb7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -682,4 +682,60 @@ MyObject.myval = 0 Call ok(CDbl(MyObject) = 0, "CDbl(MyObject) = " & CDbl(MyObject)) Call ok(getVT(CDbl(MyObject)) = "VT_R8", "getVT(CDbl(MyObject)) = " & getVT(CDbl(MyObject))) +Sub testCLngError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CLng(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CLng(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CLng(Empty) = 0, "CLng(Empty) = " & CLng(Empty)) +Call ok(getVT(CLng(Empty)) = "VT_I4", "getVT(CLng(Empty)) = " & getVT(CLng(Empty))) +Call ok(CLng(CByte(0)) = 0, "CLng(CByte(0)) = " & CLng(CByte(0))) +Call ok(getVT(CLng(CCur(0))) = "VT_I4", "getVT(CLng(CCur(0))) = " & getVT(CLng(CCur(0)))) +Call ok(CLng(CCur(0)) = 0, "CLng(CCur(0)) = " & CLng(CCur(0))) +Call ok(getVT(CLng(CCur(0))) = "VT_I4", "getVT(CLng(CCur(0))) = " & getVT(CLng(CCur(0)))) +Call ok(CLng(0) = 0, "CLng(0) = " & CLng(0)) +Call ok(getVT(CLng(0)) = "VT_I4", "getVT(CLng(0)) = " & getVT(CLng(0))) +Call ok(CLng(0.49) = 0, "CLng(0.49) = " & CLng(0.49)) +Call ok(getVT(CLng(0.49)) = "VT_I4", "getVT(CLng(0.49)) = " & getVT(CLng(0.49))) +Call ok(CLng(0.5) = 0, "CLng(0.5) = " & CLng(0.5)) +Call ok(getVT(CLng(0.5)) = "VT_I4", "getVT(CLng(0.5)) = " & getVT(CLng(0.5))) +Call ok(CLng(0.51) = 1, "CLng(0.51) = " & CLng(0.51)) +Call ok(getVT(CLng(0.51)) = "VT_I4", "getVT(CLng(0.51)) = " & getVT(CLng(0.51))) +Call ok(CLng(1.49) = 1, "CLng(1.49) = " & CLng(1.49)) +Call ok(getVT(CLng(1.49)) = "VT_I4", "getVT(CLng(1.49)) = " & getVT(CLng(1.49))) +Call ok(CLng(1.5) = 2, "CLng(1.5) = " & CLng(1.5)) +Call ok(getVT(CLng(1.5)) = "VT_I4", "getVT(CLng(1.5)) = " & getVT(CLng(1.5))) +Call ok(CLng(1.51) = 2, "CLng(1.51) = " & CLng(1.51)) +Call ok(getVT(CLng(1.51)) = "VT_I4", "getVT(CLng(1.51)) = " & getVT(CLng(1.51))) +Call ok(CLng("-1") = -1, "CLng(""-1"") = " & CLng("-1")) +Call ok(getVT(CLng("-1")) = "VT_I4", "getVT(CLng(""-1"")) = " & getVT(CLng("-1"))) +If isEnglishLang Then + Call ok(CLng("-0.5") = 0, "CLng(""-0.5"") = " & CLng("-0.5")) + Call ok(getVT(CLng("-0.5")) = "VT_I4", "getVT(CLng(""-0.5"")) = " & getVT(CLng("-0.5"))) +End If +Call testCLngError("", 13, 13) +Call testCLngError("TRUE", 13, 13) +Call testCLngError("FALSE", 13, 13) +Call testCLngError("#TRue#", 13, 13) +Call testCLngError("#fAlSE#", 13, 13) +Call testCLngError(1, 0, 458) +Call ok(CLng(True) = -1, "CLng(True) = " & CLng(True)) +Call ok(getVT(CLng(True)) = "VT_I4", "getVT(CLng(True)) = " & getVT(CLng(True))) +Call ok(CLng(False) = 0, "CLng(False) = " & CLng(False)) +Call ok(getVT(CLng(False)) = "VT_I4", "getVT(CLng(False)) = " & getVT(CLng(False))) +MyObject.myval = 1 +Call ok(CLng(MyObject) = 1, "CLng(MyObject) = " & CLng(MyObject)) +Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) +MyObject.myval = 0 +Call ok(CLng(MyObject) = 0, "CLng(MyObject) = " & CLng(MyObject)) +Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) + Call reportSuccess()

1 0

Damjan Jovanovic : winex11.drv: Don' t bother counting how many XDND selections are converted.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: a8499c0803ccace80b1b753a7d53c5969be9743a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8499c0803ccace80b1b753a7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:21:44 2014 +0200 winex11.drv: Don't bother counting how many XDND selections are converted. --- dlls/winex11.drv/xdnd.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 5ed0787..eb98215 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -75,9 +75,9 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len); -static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len); +static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, - Atom *types, unsigned long *count); + Atom *types, unsigned long count); static void X11DRV_XDND_SendDropFiles(HWND hwnd); static void X11DRV_XDND_FreeDragDropOp(void); static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len); @@ -257,7 +257,7 @@ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) /* Do a one-time data read and cache results */ X11DRV_XDND_ResolveProperty(event->display, event->window, - event->data.l[1], xdndtypes, &count); + event->data.l[1], xdndtypes, count); if (event->data.l[1] & 1) XFree(xdndtypes); @@ -454,7 +454,7 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) * Resolve all MIME types to windows clipboard formats. All data is cached. */ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, - Atom *types, unsigned long *count) + Atom *types, unsigned long count) { unsigned int i, j; BOOL res; @@ -462,16 +462,15 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom acttype; int actfmt; unsigned long bytesret, icount; - int entries = 0; unsigned char* data = NULL; XDNDDATA *current, *next; BOOL haveHDROP = FALSE; - TRACE("count(%ld)\n", *count); + TRACE("count(%ld)\n", count); X11DRV_XDND_FreeDragDropOp(); /* Clear previously cached data */ - for (i = 0; i < *count; i++) + for (i = 0; i < count; i++) { TRACE("requesting atom %ld from xwin %ld\n", types[i], xwin); @@ -498,7 +497,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, XGetWindowProperty(display, xwin, x11drv_atom(XdndTarget), 0, 65535, FALSE, AnyPropertyType, &acttype, &actfmt, &icount, &bytesret, &data); - entries += X11DRV_XDND_MapFormat(types[i], data, get_property_size( actfmt, icount )); + X11DRV_XDND_MapFormat(types[i], data, get_property_size( actfmt, icount )); XFree(data); } @@ -522,12 +521,9 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, list_remove(&current->entry); HeapFree(GetProcessHeap(), 0, current->data); HeapFree(GetProcessHeap(), 0, current); - --entries; } } } - - *count = entries; } @@ -558,10 +554,9 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns * * Map XDND MIME format to windows clipboard format. */ -static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len) +static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len) { void* xdata; - int count = 0; TRACE("%d: %s\n", property, data); @@ -569,16 +564,13 @@ static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int xdata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); memcpy(xdata, data, len); X11DRV_XDND_InsertXDNDData(property, property, xdata, len); - count++; if (property == x11drv_atom(text_uri_list)) - count += X11DRV_XDND_DeconstructTextURIList(property, data, len); + X11DRV_XDND_DeconstructTextURIList(property, data, len); else if (property == x11drv_atom(text_plain)) - count += X11DRV_XDND_DeconstructTextPlain(property, data, len); + X11DRV_XDND_DeconstructTextPlain(property, data, len); else if (property == x11drv_atom(text_html)) - count += X11DRV_XDND_DeconstructTextHTML(property, data, len); - - return count; + X11DRV_XDND_DeconstructTextHTML(property, data, len); }

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::insertCell method implementation.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 48e41c4dd70243ced8412ae911722fdece37e923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e41c4dd70243ced8412ae91… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon May 26 22:12:50 2014 +0800 mshtml: Added IHTMLTableRow::insertCell method implementation. --- dlls/mshtml/htmltablerow.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 731b403..589a38f 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -308,8 +308,27 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC static HRESULT WINAPI HTMLTableRow_insertCell(IHTMLTableRow *iface, LONG index, IDispatch **row) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%d %p)\n", This, index, row); - return E_NOTIMPL; + nsIDOMHTMLElement *nselem; + HTMLElement *elem; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%d %p)\n", This, index, row); + nsres = nsIDOMHTMLTableRowElement_InsertCell(This->nsrow, index, &nselem); + if(NS_FAILED(nsres)) { + ERR("Insert Cell at %d failed: %08x\n", index, nsres); + return E_FAIL; + } + + hres = HTMLTableCell_Create(This->element.node.doc, nselem, &elem); + nsIDOMHTMLElement_Release(nselem); + if (FAILED(hres)) { + ERR("Create TableCell failed: %08x\n", hres); + return hres; + } + + *row = (IDispatch *)&elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLTableRow_deleteCell(IHTMLTableRow *iface, LONG index) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c16e073..4eb02fc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5737,10 +5737,22 @@ static void _test_tr_possess(unsigned line, IHTMLElement *elem, static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) { HRESULT hres; + IDispatch *disp; + IUnknown *unk; hres = IHTMLTableRow_deleteCell(row, 0); ok(hres == S_OK, "deleteCell failed: %08x\n", hres); test_tr_possess(elem, row, 1, "td2"); + + hres = IHTMLTableRow_insertCell(row, 0, &disp); + ok(hres == S_OK, "insertCell failed: %08x\n", hres); + ok(disp != NULL, "disp == NULL\n"); + hres = IDispatch_QueryInterface(disp, &IID_IHTMLTableCell, (void **)&unk); + ok(hres == S_OK, "Could not get IID_IHTMLTableCell interface: %08x\n", hres); + if (SUCCEEDED(hres)) + IUnknown_Release(unk); + test_tr_possess(elem, row, 2, "td2"); + IDispatch_Release(disp); } static void test_tr_elem(IHTMLElement *elem)

1 0

Vincent Povirk : ole32: Support storage files larger than 4 GB.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 81079552738be5291e563186e9acbbb22e50bbcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=81079552738be5291e563186e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 20 16:08:09 2014 -0500 ole32: Support storage files larger than 4 GB. --- dlls/ole32/stg_stream.c | 4 +- dlls/ole32/storage32.c | 100 ++++++++++++++++++++++------------------------- dlls/ole32/storage32.h | 1 + 3 files changed, 49 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81079552738be5291e563…

1 0

Felix Janda : dnsapi: stdio.h needs to be included for sprintf().
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 12e1ff956a058dc1860126f56bd28c052c1cdadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e1ff956a058dc1860126f56… Author: Felix Janda <felix.janda(a)posteo.de> Date: Tue Jun 3 22:33:27 2014 +0200 dnsapi: stdio.h needs to be included for sprintf(). --- dlls/dnsapi/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index b1d80dd..578239e 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -24,6 +24,7 @@ #include <stdarg.h> #include <string.h> +#include <stdio.h> #include <sys/types.h> #ifdef HAVE_NETINET_IN_H

1 0