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

Thomas Faber : wined3d: Use INFINITY.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: a6510b3fbcfd35644f39ee02637392805f0b60dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6510b3fbcfd35644f39ee026… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jun 17 16:07:30 2012 +0200 wined3d: Use INFINITY. --- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 35e1736..b3d5fa3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1049,7 +1049,7 @@ void state_fogstartend(struct wined3d_context *context, const struct wined3d_sta fogend = tmpvalue.f; /* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/ if(fogstart == fogend) { - fogstart = -1.0f / 0.0f; + fogstart = -INFINITY; fogend = 0.0f; } break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4b5176d..9aa4be3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -199,7 +199,7 @@ static inline float float_16_to_32(const unsigned short *in) { } else if(e < 31) { return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { - if(m == 0) return sgn / 0.0f; /* +INF / -INF */ + if(m == 0) return sgn * INFINITY; else return NAN; } } @@ -221,7 +221,7 @@ static inline float float_24_to_32(DWORD in) } else { - if (m == 0) return sgn / 0.0f; /* +INF / -INF */ + if (m == 0) return sgn * INFINITY; else return NAN; } }

1 0

Thomas Faber : include: Make IMAGE_COR20_HEADER declaration compatible with PSDK headers.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: bb95b706cb5b7022fb56f48222b1034dd133b4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb95b706cb5b7022fb56f4822… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jun 17 15:51:56 2012 +0200 include: Make IMAGE_COR20_HEADER declaration compatible with PSDK headers. --- dlls/fusion/tests/asmcache.c | 2 +- include/winnt.h | 5 ++++- tools/winedump/pe.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 890bd9c..e97cfbe 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -412,7 +412,7 @@ static struct _tagASSEMBLY 5, /* MinorRuntimeVersion */ { 0x2188, 0x1B4 }, /* MetaData */ COMIMAGE_FLAGS_ILONLY | COMIMAGE_FLAGS_STRONGNAMESIGNED, /* Flags */ - 0, /* EntryPointToken */ + { 0 }, /* EntryPointToken */ { 0x20D0, 0xB8 }, /* Resources */ { 0x2050, 0x80 }, /* StrongNameSignature */ { 0 }, /* CodeManagerTable */ diff --git a/include/winnt.h b/include/winnt.h index 6903d34..16cc4e9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3429,7 +3429,10 @@ typedef struct IMAGE_COR20_HEADER IMAGE_DATA_DIRECTORY MetaData; DWORD Flags; - DWORD EntryPointToken; + union { + DWORD EntryPointToken; + DWORD EntryPointRVA; + } DUMMYUNIONNAME; IMAGE_DATA_DIRECTORY Resources; IMAGE_DATA_DIRECTORY StrongNameSignature; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f005b49..c655451 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -966,7 +966,7 @@ static void dump_dir_clr_header(void) print_dword( "Header Size", dir->cb ); print_ver( "Required runtime version", dir->MajorRuntimeVersion, dir->MinorRuntimeVersion ); print_clrflags( "Flags", dir->Flags ); - print_dword( "EntryPointToken", dir->EntryPointToken ); + print_dword( "EntryPointToken", dir->u.EntryPointToken ); printf("\n"); printf( "CLR Data Directory\n" ); print_clrdirectory( "MetaData", &dir->MetaData );

1 0

Nikolay Sivov : msxml3: Revert: msxml3: Reuse MXAttributes implementation for SAX reader attributes reporting.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 16ef649b5fd9f7c42de482f8528b5681fe45b430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ef649b5fd9f7c42de482f85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 17 16:37:45 2012 +0400 msxml3: Revert: msxml3: Reuse MXAttributes implementation for SAX reader attributes reporting. This reverts commit c2c8b9e771a1eb80cab4b142a3bc3ed5434a4a47 and adds a comment for uri reporting feature that some application use, for example Office 2010. The problem is that namespace uri pointer should stay the same and we keep it in element stack for that, MXAttributes allocates new string for each attribute and won't work as needed unfortunately. --- dlls/msxml3/saxreader.c | 533 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 391 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16ef649b5fd9f7c42de48…

1 0

Nikolay Sivov : msxml3: Reader shouldn' t depend on input being properly allocated BSTR string.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 7cbd9dcdc31e7d2febcb562f96ae2aa6d8960bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbd9dcdc31e7d2febcb562f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 17 23:51:09 2012 +0400 msxml3: Reader shouldn't depend on input being properly allocated BSTR string. --- dlls/msxml3/saxreader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index cf87d98..485644a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2151,6 +2151,8 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz saxlocator *locator; HRESULT hr; + TRACE("(%p)->(%p %d)\n", This, buffer, size); + hr = SAXLocator_create(This, &locator, vbInterface); if (FAILED(hr)) return hr; @@ -2441,7 +2443,7 @@ static HRESULT internal_parse( { case VT_BSTR: hr = internal_parseBuffer(This, (const char*)V_BSTR(&varInput), - SysStringByteLen(V_BSTR(&varInput)), vbInterface); + strlenW(V_BSTR(&varInput))*sizeof(WCHAR), vbInterface); break; case VT_ARRAY|VT_UI1: { void *pSAData;

1 0

Dmitry Timoshkov : windowscodecs: Remove not reachable code in the TIFF decoder.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: a16f7044a44b35246185cb4153f202efd2ac3256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16f7044a44b35246185cb415… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 18 14:32:04 2012 +0900 windowscodecs: Remove not reachable code in the TIFF decoder. --- dlls/windowscodecs/tiffformat.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 66f65d1..669351d 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -440,12 +440,6 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { decode_info->tiled = 1; - if (!ret) - { - WARN("missing tile width\n"); - return E_FAIL; - } - ret = pTIFFGetField(tiff, TIFFTAG_TILELENGTH, &decode_info->tile_height); if (!ret) {

1 0

Alexandre Julliard : gdi32: Fix the contents of the region data in metafiles.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: b61925e1eaa729705236ba7044e6af59b19fe456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b61925e1eaa729705236ba704… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 18 10:54:20 2012 +0200 gdi32: Fix the contents of the region data in metafiles. --- dlls/gdi32/mfdrv/graphics.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 665926b..439fca5 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -309,13 +309,21 @@ static INT16 MFDRV_CreateRegion(PHYSDEV dev, HRGN hrgn) *Param++ = pCurRect->right; } } - len = Param - (WORD *)mr; + + if (StartBand) + { + *StartBand = Param - StartBand - 3; + *Param++ = *StartBand; + if(*StartBand > MaxBands) + MaxBands = *StartBand; + Bands++; + } mr->rdParm[0] = 0; mr->rdParm[1] = 6; mr->rdParm[2] = 0x1234; mr->rdParm[3] = 0; - mr->rdParm[4] = len * 2; + mr->rdParm[4] = (Param - mr->rdParm) * sizeof(WORD); mr->rdParm[5] = Bands; mr->rdParm[6] = MaxBands; mr->rdParm[7] = rgndata->rdh.rcBound.left; @@ -323,7 +331,7 @@ static INT16 MFDRV_CreateRegion(PHYSDEV dev, HRGN hrgn) mr->rdParm[9] = rgndata->rdh.rcBound.right; mr->rdParm[10] = rgndata->rdh.rcBound.bottom; mr->rdFunction = META_CREATEREGION; - mr->rdSize = len / 2; + mr->rdSize = Param - (WORD *)mr; ret = MFDRV_WriteRecord( dev, mr, mr->rdSize * 2 ); HeapFree( GetProcessHeap(), 0, mr ); HeapFree( GetProcessHeap(), 0, rgndata );

1 0

Alexandre Julliard : wing32: Don't recommend a top-down DIB.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: cdd18731a751fb85438783b61dea45ceacc7097a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd18731a751fb85438783b61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 18 10:54:50 2012 +0200 wing32: Don't recommend a top-down DIB. --- dlls/wing32/wing32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index 7ec5914..0c942a6 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -42,7 +42,7 @@ BOOL WINAPI WinGRecommendDIBFormat( BITMAPINFO *bmi ) bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmi->bmiHeader.biWidth = 320; - bmi->bmiHeader.biHeight = -1; + bmi->bmiHeader.biHeight = 1; bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biBitCount = 8; bmi->bmiHeader.biCompression = BI_RGB;

1 0

Nozomi Kodama : d3dx9_36: Implementation of D3DXSHMultiply3.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 60a0fb30dfc444805b443438e0de9ce9ce2e9517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a0fb30dfc444805b443438e… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Fri Jun 15 11:51:54 2012 +0800 d3dx9_36: Implementation of D3DXSHMultiply3. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 101 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 28 ++++++++++++ include/d3dx9math.h | 1 + 4 files changed, 131 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index d8fcaa4..338585a 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -280,7 +280,7 @@ @ stub D3DXSHEvalHemisphereLight(long ptr long long ptr ptr ptr) @ stub D3DXSHEvalSphericalLight(long ptr long long long long ptr ptr ptr) @ stub D3DXSHMultiply2(ptr ptr ptr) -@ stub D3DXSHMultiply3(ptr ptr ptr) +@ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stub D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 499d368..529665b 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1967,6 +1967,8 @@ FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n) return pout; } +/*_________________D3DXSH________________*/ + FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, const FLOAT *a, const FLOAT *b) { UINT i; @@ -1978,3 +1980,102 @@ FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, const FLOAT *a, const FLOAT *b) return out; } + +FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b) +{ + FLOAT t, ta, tb; + + TRACE("(%p, %p, %p)\n", out, a, b); + + out[0]= 0.28209479f * a[0] * b[0]; + + ta = 0.28209479f * a[0] - 0.12615662f * a[6] - 0.21850968f * a[8]; + tb = 0.28209479f * b[0] - 0.12615662f * b[6] - 0.21850968f * b[8]; + out[1] = ta * b[1] + tb * a[1]; + t = a[1] * b[1]; + out[0] += 0.28209479f * t; + out[6] = -0.12615662f * t; + out[8] = -0.21850968f * t; + + ta = 0.21850968f * a[5]; + tb = 0.21850968f * b[5]; + out[1] += ta * b[2] + tb * a[2]; + out[2] = ta * b[1] + tb * a[1]; + t = a[1] * b[2] +a[2] * b[1]; + out[5] = 0.21850968f * t; + + ta = 0.21850968f * a[4]; + tb = 0.21850968f * b[4]; + out[1] += ta * b[3] + tb * a[3]; + out[3] = ta * b[1] + tb * a[1]; + t = a[1] * b[3] + a[3] * b[1]; + out[4] = 0.21850968f * t; + + ta = 0.28209480f * a[0] + 0.25231326f * a[6]; + tb = 0.28209480f * b[0] + 0.25231326f * b[6]; + out[2] += ta * b[2] + tb * a[2]; + t = a[2] * b[2]; + out[0] += 0.28209480f * t; + out[6] += 0.25231326f * t; + + ta = 0.21850969f * a[7]; + tb = 0.21850969f * b[7]; + out[2] += ta * b[3] + tb * a[3]; + out[3] += ta * b[2] + tb * a[2]; + t = a[2] * b[3] + a[3] * b[2]; + out[7] = 0.21850969f * t; + + ta = 0.28209479f * a[0] - 0.12615663f * a[6] + 0.21850969f * a[8]; + tb = 0.28209479f * b[0] - 0.12615663f * b[6] + 0.21850969f * b[8]; + out[3] += ta * b[3] + tb * a[3]; + t = a[3] * b[3]; + out[0] += 0.28209479f * t; + out[6] -= 0.12615663f * t; + out[8] += 0.21850969f * t; + + ta = 0.28209479f * a[0] - 0.18022375f * a[6]; + tb = 0.28209479f * b[0] - 0.18022375f * b[6]; + out[4] += ta * b[4] + tb * a[4]; + t = a[4] * b[4]; + out[0] += 0.28209479f * t; + out[6] -= 0.18022375f * t; + + ta = 0.15607835f * a[7]; + tb = 0.15607835f * b[7]; + out[4] += ta * b[5] + tb * a[5]; + out[5] += ta * b[4] + tb * a[4]; + t = a[4] * b[5] + a[5] * b[4]; + out[7] += 0.15607834f * t; + + ta = 0.28209479f * a[0] + 0.09011186 * a[6] - 0.15607835f * a[8]; + tb = 0.28209479f * b[0] + 0.09011186 * b[6] - 0.15607835f * b[8]; + out[5] += ta * b[5] + tb * a[5]; + t = a[5] * b[5]; + out[0] += 0.28209479f * t; + out[6] += 0.09011186f * t; + out[8] -= 0.15607835f * t; + + ta = 0.28209480f * a[0]; + tb = 0.28209480f * b[0]; + out[6] += ta * b[6] + tb * a[6]; + t = a[6] * b[6]; + out[0] += 0.28209480f * t; + out[6] += 0.18022376f * t; + + ta = 0.28209479f * a[0] + 0.09011186 * a[6] + 0.15607835f * a[8]; + tb = 0.28209479f * b[0] + 0.09011186 * b[6] + 0.15607835f * b[8]; + out[7] += ta * b[7] + tb * a[7]; + t = a[7] * b[7]; + out[0] += 0.28209479f * t; + out[6] += 0.09011186f * t; + out[8] += 0.15607835f * t; + + ta = 0.28209479f * a[0] - 0.18022375f * a[6]; + tb = 0.28209479f * b[0] - 0.18022375f * b[6]; + out[8] += ta * b[8] + tb * a[8]; + t = a[8] * b[8]; + out[0] += 0.28209479f * t; + out[6] -= 0.18022375f * t; + + return out; +} diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index e732691..c2a652c 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2399,6 +2399,33 @@ static void test_D3DXSHAdd(void) } } +static void test_D3DXSHMultiply3(void) +{ + unsigned int i; + FLOAT a[20], b[20], c[20]; + const FLOAT expected[] = + { 7.813913f, 2.256058f, 5.9484005f, 4.970894f, 2.899858f, 3.598946f, 1.726572f, 5.573538f, + 0.622063f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f, 17.0f, 18.0f, 19.0f, }; + + + for (i = 0; i < 20; i++) + { + a[i] = 1.0f + (FLOAT)i/100.0f; + b[i] = 3.0f - (FLOAT)i/100.0f; + c[i] = (FLOAT)i; + } + + D3DXSHMultiply3(c, a, b); + for (i = 0; i < 9; i++) + ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); + +/* D3DXSHMultiply does not modify the elements of the array after the nineth element */ + for (i = 8; i < 19; i++) + ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); + + return; +} + START_TEST(math) { D3DXColorTest(); @@ -2416,4 +2443,5 @@ START_TEST(math) test_D3DXVec_Array(); test_D3DXFloat_Array(); test_D3DXSHAdd(); + test_D3DXSHMultiply3(); } diff --git a/include/d3dx9math.h b/include/d3dx9math.h index a1fd70a..b650b48 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -378,6 +378,7 @@ D3DXFLOAT16 *WINAPI D3DXFloat32To16Array(D3DXFLOAT16 *pout, CONST FLOAT *pin, UI FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n); FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, CONST FLOAT *a, CONST FLOAT *b); +FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); #ifdef __cplusplus }

1 0

Nozomi Kodama : d3dx9_36: Recognize A8B8G8R8 format.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 5523820b810d16fd17da86fcf7930fd3f27acdf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5523820b810d16fd17da86fcf… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Sat Jun 16 03:14:49 2012 +0800 d3dx9_36: Recognize A8B8G8R8 format. --- dlls/d3dx9_36/surface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 603f8d8..f71af32 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -190,6 +190,7 @@ static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_forma { 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, D3DFMT_A2B10G10R10 }, { 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10 }, { 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000, D3DFMT_G16R16 }, + { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, D3DFMT_A8B8G8R8 }, }; for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++)

1 0

André Hentschel : jscript/tests: Fix some typos.
by Alexandre Julliard 18 Jun '12

18 Jun '12

Module: wine Branch: master Commit: 2f7453f81f6201751bc19a8601016057b649ad6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7453f81f6201751bc19a860… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 15 23:23:55 2012 +0200 jscript/tests: Fix some typos. --- dlls/jscript/tests/api.js | 4 ++-- dlls/jscript/tests/run.c | 38 +++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 4366aa1..d8f86f5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -395,7 +395,7 @@ ok(tmp === "2,ad", "arr.concat = " + tmp); m = "a+bcabc".match("a+"); ok(typeof(m) === "object", "typeof m is not object"); ok(m.length === 1, "m.length is not 1"); -ok(m["0"] === "a", "m[0] is not \"ab\""); +ok(m["0"] === "a", "m[0] is not \"a\""); r = "- [test] -".replace("[test]", "success"); ok(r === "- success -", "r = " + r + " expected '- success -'"); @@ -408,7 +408,7 @@ ok(r === "test", "r = " + r + " expected 'test'"); function replaceFunc3(m, off, str) { ok(arguments.length === 3, "arguments.length = " + arguments.length); - ok(m === "[test]", "m = " + m + " expected [test1]"); + ok(m === "[test]", "m = " + m + " expected [test]"); ok(off === 1, "off = " + off + " expected 0"); ok(str === "-[test]-", "str = " + arguments[3]); return "ret"; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index f9de734..b0fd684 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -569,8 +569,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(!pvarRes, "pvarRes != NULL\n"); ok(pei != NULL, "pei == NULL\n"); - ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); - ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(pdp->rgvarg+1) = %d\n", V_VT(pdp->rgvarg+1)); ok(V_BOOL(pdp->rgvarg+1), "%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); return S_OK; @@ -585,7 +585,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(!pvarRes, "pvarRes != NULL\n"); ok(pei != NULL, "pei == NULL\n"); - ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); if(V_VT(pdp->rgvarg) == VT_BSTR) trace("%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); @@ -764,7 +764,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(pvarRes == NULL, "pvarRes != NULL\n"); ok(pei != NULL, "pei == NULL\n"); - ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(arg) = %d\n", V_VT(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); ok(V_DISPATCH(pdp->rgvarg) == (IDispatch*)iface, "disp != iface\n"); return S_OK; @@ -874,14 +874,14 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(!pvarRes, "pvarRes != NULL\n"); ok(pei != NULL, "pei == NULL\n"); - ok(V_VT(pdp->rgvarg) == VT_I4, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); - ok(V_I4(pdp->rgvarg) == 2, "V_I4(psp->rgvargs) = %d\n", V_I4(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg) == VT_I4, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I4(pdp->rgvarg) == 2, "V_I4(pdp->rgvarg) = %d\n", V_I4(pdp->rgvarg)); - ok(V_VT(pdp->rgvarg+1) == VT_I4, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg+1)); - ok(V_I4(pdp->rgvarg+1) == 1, "V_I4(psp->rgvargs+1) = %d\n", V_I4(pdp->rgvarg+1)); + ok(V_VT(pdp->rgvarg+1) == VT_I4, "V_VT(pdp->rgvarg+1) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I4(pdp->rgvarg+1) == 1, "V_I4(pdp->rgvarg+1) = %d\n", V_I4(pdp->rgvarg+1)); - ok(V_VT(pdp->rgvarg+2) == VT_I4, "V_VT(psp->rgvargs+2) = %d\n", V_VT(pdp->rgvarg+2)); - ok(V_I4(pdp->rgvarg+2) == 0, "V_I4(psp->rgvargs+2) = %d\n", V_I4(pdp->rgvarg+2)); + ok(V_VT(pdp->rgvarg+2) == VT_I4, "V_VT(pdp->rgvarg+2) = %d\n", V_VT(pdp->rgvarg+2)); + ok(V_I4(pdp->rgvarg+2) == 0, "V_I4(pdp->rgvarg+2) = %d\n", V_I4(pdp->rgvarg+2)); return S_OK; case DISPID_GLOBAL_OBJECT_FLAG: { @@ -952,19 +952,19 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(pdp->cArgs == 5, "cArgs = %d\n", pdp->cArgs); ok(!pvarRes, "pvarRes != NULL\n"); - ok(V_VT(pdp->rgvarg+1) == VT_I4, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); - ok(V_I4(pdp->rgvarg+1) == 10, "V_I4(psp->rgvargs+1) = %d\n", V_I4(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg+1) == VT_I4, "V_VT(pdp->rgvarg+1) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I4(pdp->rgvarg+1) == 10, "V_I4(pdp->rgvarg+1) = %d\n", V_I4(pdp->rgvarg+1)); - ok(V_VT(pdp->rgvarg+2) == VT_I4, "V_VT(psp->rgvargs+2) = %d\n", V_VT(pdp->rgvarg+1)); - ok(V_I4(pdp->rgvarg+2) == 10, "V_I4(psp->rgvargs+2) = %d\n", V_I4(pdp->rgvarg+1)); + ok(V_VT(pdp->rgvarg+2) == VT_I4, "V_VT(pdp->rgvarg+2) = %d\n", V_VT(pdp->rgvarg+2)); + ok(V_I4(pdp->rgvarg+2) == 10, "V_I4(pdp->rgvarg+2) = %d\n", V_I4(pdp->rgvarg+2)); - ok(V_VT(pdp->rgvarg+3) == VT_I4, "V_VT(psp->rgvargs+3) = %d\n", V_VT(pdp->rgvarg+3)); - ok(V_I4(pdp->rgvarg+3) == 22, "V_I4(psp->rgvargs+3) = %d\n", V_I4(pdp->rgvarg+3)); + ok(V_VT(pdp->rgvarg+3) == VT_I4, "V_VT(pdp->rgvarg+3) = %d\n", V_VT(pdp->rgvarg+3)); + ok(V_I4(pdp->rgvarg+3) == 22, "V_I4(pdp->rgvarg+3) = %d\n", V_I4(pdp->rgvarg+3)); - ok(V_VT(pdp->rgvarg+4) == VT_I4, "V_VT(psp->rgvargs+4) = %d\n", V_VT(pdp->rgvarg+4)); - ok(V_I4(pdp->rgvarg+4) == 22, "V_I4(psp->rgvargs+4) = %d\n", V_I4(pdp->rgvarg+4)); + ok(V_VT(pdp->rgvarg+4) == VT_I4, "V_VT(pdp->rgvarg+4) = %d\n", V_VT(pdp->rgvarg+4)); + ok(V_I4(pdp->rgvarg+4) == 22, "V_I4(pdp->rgvarg+4) = %d\n", V_I4(pdp->rgvarg+4)); - ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); V_VT(args) = VT_I2; V_I2(args) = 2;

1 0