wine-commits September 2009

wine-commits@winehq.org

3 participants
866 discussions

Nikolay Sivov : comctl32/listview: Skip LVS_EX_CHECKBOXES tests when this style is unsupported.
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: df3f2a1b13660ebad376e40401d6c3e74c68db15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3f2a1b13660ebad376e4040… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 23 01:56:02 2009 +0400 comctl32/listview: Skip LVS_EX_CHECKBOXES tests when this style is unsupported. --- dlls/comctl32/tests/listview.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d0f2273..cd79fd5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -837,7 +837,12 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); - ok(item.state == 0x1ccc, "state %x\n", item.state); + if (item.state != 0x1ccc) + { + win_skip("LVS_EX_CHECKBOXES style is unavailable. Skipping.\n"); + DestroyWindow(hwnd); + return; + } /* Now add an item without specifying a state and check that its state goes to 0x1000 */ item.iItem = 2;

1 0

Michael Stefaniuc : kernel32: Add missing stdarg.h include.
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: a8c19696f1c71d8b479fc3995d5539ef51e6bf47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c19696f1c71d8b479fc3995… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 22 23:51:49 2009 +0200 kernel32: Add missing stdarg.h include. This fixes a compile breakage with older gcc versions. --- dlls/kernel32/cpu.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 40d3825..d08e429 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -22,6 +22,7 @@ #include "config.h" #include "wine/port.h" +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #ifdef HAVE_SYS_TIME_H

1 0

Huw Davies : ntdll: Fix build on MacOSX.
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: 90f95172b8bab8ba72b561caf3a86a1b2482417b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f95172b8bab8ba72b561caf… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 22 20:36:28 2009 +0100 ntdll: Fix build on MacOSX. --- dlls/ntdll/nt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 21fefef..f221792 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1322,7 +1322,7 @@ void fill_cpu_info(void) switch (cputype) { case CPU_TYPE_POWERPC: - cached_sci.ProcessorArchitecture = PROCESSOR_ARCHITECTURE_PPC; + cached_sci.Architecture = PROCESSOR_ARCHITECTURE_PPC; valSize = sizeof(int); if (sysctlbyname ("hw.cpusubtype", &value, &valSize, NULL, 0) == 0) {

1 0

Vincent Povirk : winex11: Re-add the optimization for blending 1x1 pixel bitmaps.
by Alexandre Julliard 23 Sep '09

23 Sep '09

Module: wine Branch: master Commit: 2151272e45de09301e31a1eea7c60550055de768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2151272e45de09301e31a1eea… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 22 13:30:24 2009 -0500 winex11: Re-add the optimization for blending 1x1 pixel bitmaps. --- dlls/winex11.drv/xrender.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index efa8d02..9280ce3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1834,14 +1834,10 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid heightSrc = pts[1].y - pts[0].y; if (!widthDst || !heightDst || !widthSrc || !heightSrc) return TRUE; - /* If the source is a 1x1 bitmap, tiling is equivalent to stretching, but - tiling is much faster. Therefore, we do no stretching in this case. */ - repeat_src = widthSrc == 1 && heightSrc == 1; - #ifndef HAVE_XRENDERSETPICTURETRANSFORM - if((widthDst != widthSrc || heightDst != heightSrc) && !repeat_src) + if(widthDst != widthSrc || heightDst != heightSrc) #else - if(!pXRenderSetPictureTransform && !repeat_src) + if(!pXRenderSetPictureTransform) #endif { FIXME("Unable to Stretch, XRenderSetPictureTransform is currently required\n"); @@ -1859,6 +1855,10 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid return FALSE; } + /* If the source is a 1x1 bitmap, tiling is equivalent to stretching, but + tiling is much faster. Therefore, we do no stretching in this case. */ + repeat_src = dib.dsBmih.biWidth == 1 && abs(dib.dsBmih.biHeight) == 1; + if (xSrc < 0 || ySrc < 0 || widthSrc < 0 || heightSrc < 0 || xSrc + widthSrc > dib.dsBmih.biWidth || ySrc + heightSrc > abs(dib.dsBmih.biHeight)) { @@ -1966,7 +1966,10 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid /* Make sure we ALWAYS set the transformation matrix even if we don't need to scale. The reason is * that later on we want to reuse pictures (it can bring a lot of extra performance) and each time * a different transformation matrix might have been used. */ - set_xrender_transformation(src_pict, widthSrc/(double)widthDst, heightSrc/(double)heightDst, 0, 0); + if (repeat_src) + set_xrender_transformation(src_pict, 1.0, 1.0, 0, 0); + else + set_xrender_transformation(src_pict, widthSrc/(double)widthDst, heightSrc/(double)heightDst, 0, 0); pXRenderComposite(gdi_display, PictOpOver, src_pict, 0, dst_pict, 0, 0, 0, 0, xDst + devDst->dc_rect.left, yDst + devDst->dc_rect.top, widthDst, heightDst);

1 0

Ge van Geldorp : crypt32/tests: Fix cert test on Win7.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: d20d4929141bc7a8dc763428f5322c84753c6e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20d4929141bc7a8dc763428f… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Tue Sep 15 20:58:56 2009 +0200 crypt32/tests: Fix cert test on Win7. --- dlls/crypt32/tests/cert.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 415f9c7..a989346 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3143,7 +3143,8 @@ static void testGetPublicKeyLength(void) ret, GetLastError()); SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 56, "Expected length 56, got %d\n", ret); + ok(ret == 56 || broken(ret == 0 && GetLastError() == NTE_BAD_LEN) /* Win7 */, + "Expected length 56, got %d\n", ret); /* An RSA key with the DH OID */ info.Algorithm.pszObjId = oid_rsa_dh; SetLastError(0xdeadbeef); @@ -3157,12 +3158,14 @@ static void testGetPublicKeyLength(void) info.Algorithm.pszObjId = oid_rsa_rsa; SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 56, "Expected length 56, got %d\n", ret); + ok(ret == 56 || broken(ret == 0 && GetLastError() == NTE_BAD_LEN) /* Win7 */, + "Expected length 56, got %d\n", ret); /* With the RSA OID and a message encoding */ info.Algorithm.pszObjId = oid_rsa_rsa; SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, &info); - ok(ret == 56, "Expected length 56, got %d\n", ret); + ok(ret == 56 || broken(ret == 0 && GetLastError() == NTE_BAD_LEN) /* Win7 */, + "Expected length 56, got %d\n", ret); } START_TEST(cert)

1 0

James Helferty : d3d9: Fix some typos in visual test.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 6fa09d1d228b11dcf691bf340f4c2efd513de417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa09d1d228b11dcf691bf340… Author: James Helferty <jlh(a)transgaming.com> Date: Tue Sep 15 12:56:52 2009 -0400 d3d9: Fix some typos in visual test. --- dlls/d3d9/tests/visual.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0fb7899..b4f1dda 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9573,7 +9573,7 @@ static void texop_test(IDirect3DDevice9 *device) {D3DTOP_MODULATEINVALPHA_ADDCOLOR, "MODULATEINVALPHA_ADDCOLOR", D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR, D3DCOLOR_ARGB(0x00, 0x14, 0xff, 0x14)}, {D3DTOP_MODULATEINVCOLOR_ADDALPHA, "MODULATEINVCOLOR_ADDALPHA", D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA, D3DCOLOR_ARGB(0x00, 0xcc, 0x99, 0xcc)}, /* BUMPENVMAP & BUMPENVMAPLUMINANCE have their own tests */ - {D3DTOP_DOTPRODUCT3, "DOTPRODUCT2", D3DTEXOPCAPS_DOTPRODUCT3, D3DCOLOR_ARGB(0x00, 0x99, 0x99, 0x99)}, + {D3DTOP_DOTPRODUCT3, "DOTPRODUCT3", D3DTEXOPCAPS_DOTPRODUCT3, D3DCOLOR_ARGB(0x00, 0x99, 0x99, 0x99)}, {D3DTOP_MULTIPLYADD, "MULTIPLYADD", D3DTEXOPCAPS_MULTIPLYADD, D3DCOLOR_ARGB(0x00, 0xff, 0x33, 0x00)}, {D3DTOP_LERP, "LERP", D3DTEXOPCAPS_LERP, D3DCOLOR_ARGB(0x00, 0x00, 0x33, 0x33)}, }; @@ -9593,7 +9593,7 @@ static void texop_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "LockRect failed with 0x%08x\n", hr); *((DWORD *)locked_rect.pBits) = D3DCOLOR_ARGB(0x99, 0x00, 0xff, 0x00); hr = IDirect3DTexture9_UnlockRect(texture, 0); - ok(SUCCEEDED(hr), "LockRect failed with 0x%08x\n", hr); + ok(SUCCEEDED(hr), "UnlockRect failed with 0x%08x\n", hr); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); ok(SUCCEEDED(hr), "SetTexture failed with 0x%08x\n", hr); @@ -9790,9 +9790,11 @@ static void texop_range_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "GetDeviceCaps failed with 0x%08x\n", hr); if (!(caps.TextureOpCaps & D3DTEXOPCAPS_ADD)) { skip("D3DTOP_ADD is not supported, skipping value range test\n"); + return; } if (!(caps.TextureOpCaps & D3DTEXOPCAPS_SUBTRACT)) { skip("D3DTEXOPCAPS_SUBTRACT is not supported, skipping value range test\n"); + return; } hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); @@ -9834,7 +9836,7 @@ static void texop_range_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "LockRect failed with 0x%08x\n", hr); *((DWORD *)locked_rect.pBits) = D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00); hr = IDirect3DTexture9_UnlockRect(texture, 0); - ok(SUCCEEDED(hr), "LockRect failed with 0x%08x\n", hr); + ok(SUCCEEDED(hr), "UnlockRect failed with 0x%08x\n", hr); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); ok(SUCCEEDED(hr), "SetTexture failed with 0x%08x\n", hr); @@ -9873,7 +9875,7 @@ static void texop_range_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "SetTextureStageState failed with 0x%08x\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); ok(SUCCEEDED(hr), "SetTextureStageState failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 1, NULL); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); ok(SUCCEEDED(hr), "SetTexture failed with 0x%08x\n", hr); IDirect3DTexture9_Release(texture); } @@ -9905,7 +9907,7 @@ static void alphareplicate_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed with 0x%08x\n", hr); hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with 0x%08x\n", hr); } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); @@ -9978,7 +9980,7 @@ static void dp3_alpha_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed with 0x%08x\n", hr); hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with 0x%08x\n", hr); } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Gerald Pfeifer : netapi32: Remove two conditions which always hold true.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 4dedab61524d2568201dd700ae911c547c2edc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dedab61524d2568201dd700a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Sep 19 21:21:39 2009 +0200 netapi32: Remove two conditions which always hold true. --- dlls/netapi32/nbt.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 0bddd94..8c76b6e 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1478,8 +1478,7 @@ void NetBTInit(void) gBCastQueries = dword; size = sizeof(dword); if (RegQueryValueExW(hKey, BcastNameQueryTimeoutW, NULL, NULL, - (LPBYTE)&dword, &size) == ERROR_SUCCESS && dword >= MIN_QUERY_TIMEOUT - && dword <= MAX_QUERY_TIMEOUT) + (LPBYTE)&dword, &size) == ERROR_SUCCESS && dword >= MIN_QUERY_TIMEOUT) gBCastQueryTimeout = dword; size = sizeof(dword); if (RegQueryValueExW(hKey, NameSrvQueryCountW, NULL, NULL, @@ -1488,8 +1487,7 @@ void NetBTInit(void) gWINSQueries = dword; size = sizeof(dword); if (RegQueryValueExW(hKey, NameSrvQueryTimeoutW, NULL, NULL, - (LPBYTE)&dword, &size) == ERROR_SUCCESS && dword >= MIN_QUERY_TIMEOUT - && dword <= MAX_QUERY_TIMEOUT) + (LPBYTE)&dword, &size) == ERROR_SUCCESS && dword >= MIN_QUERY_TIMEOUT) gWINSQueryTimeout = dword; size = sizeof(gScopeID) - 1; if (RegQueryValueExW(hKey, ScopeIDW, NULL, NULL, (LPBYTE)gScopeID + 1, &size)

1 0

Marcus Meissner : jscript: Check for arg_array being NULL (Coverity).
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 5aa790d0a3b24cfc452066260104c9cca2e83be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa790d0a3b24cfc452066260… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 20 23:13:03 2009 +0200 jscript: Check for arg_array being NULL (Coverity). --- dlls/jscript/function.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 1b1b4e7..1f1826b 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -432,7 +432,8 @@ static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR if(V_VT(get_arg(dp,1)) == VT_DISPATCH) { arg_array = iface_to_jsdisp((IUnknown*)V_DISPATCH(get_arg(dp,1))); - if(!is_class(arg_array, JSCLASS_ARRAY) && !is_class(arg_array, JSCLASS_ARGUMENTS)) { + if(arg_array && ( + !is_class(arg_array, JSCLASS_ARRAY) && !is_class(arg_array, JSCLASS_ARGUMENTS) )) { jsdisp_release(arg_array); arg_array = NULL; }

1 0

Marcus Meissner : mshmtl: Check nsrange before calling ->Release (coverity) .
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: c997a518692d3dbd501cec93168323104057716d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c997a518692d3dbd501cec931… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 20 18:43:24 2009 +0200 mshmtl: Check nsrange before calling ->Release (coverity). --- dlls/mshtml/selection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 65e3ecb..f1909be 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -182,7 +182,7 @@ static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *ifac hres = HTMLTxtRange_Create(This->doc, nsrange, &range_obj); - nsIDOMRange_Release(nsrange); + if (nsrange) nsIDOMRange_Release(nsrange); *range = (IDispatch*)range_obj; return hres; }

1 0

Huw Davies : oledb32/tests: Add tests for conversions to DBTYPE_I4.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 62a75bfc3e7fb584d57777c8d46216905676b280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a75bfc3e7fb584d57777c8d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 22 13:45:27 2009 +0100 oledb32/tests: Add tests for conversions to DBTYPE_I4. --- dlls/oledb32/tests/convert.c | 220 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 220 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 9c64a54..7c3fd20 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -338,10 +338,230 @@ static void test_canconvert(void) IDataConvert_Release(convert); } +static void test_converttoi4(void) +{ + IDataConvert *convert; + HRESULT hr; + INT i4; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + static const WCHAR ten[] = {'1','0',0}; + BSTR b; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + +todo_wine +{ + i4 = 0x12345678; + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 0, "got %08x\n", i4); + + i4 = 0x12345678; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); +} + ok(i4 == 0x12345678, "got %08x\n", i4); + +todo_wine +{ + i4 = 0x12345678; + *(short *)src = 0x4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 0x4321, "got %08x\n", i4); + + i4 = 0x12345678; + *(int *)src = 0x4321cafe; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 0x4321cafe, "got %08x\n", i4); + + i4 = 0x12345678; + *(FLOAT *)src = 10.75; + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 11, "got %08x\n", i4); + + i4 = 0x12345678; + *(FLOAT *)src = -10.75; + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == -11, "got %08x\n", i4); + + i4 = 0x12345678; + *(double *)src = 10.75; + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 11, "got %08x\n", i4); + + i4 = 0x12345678; + ((LARGE_INTEGER *)src)->QuadPart = 107500; + hr = IDataConvert_DataConvert(convert, DBTYPE_CY, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 11, "got %08x\n", i4); + + i4 = 0x12345678; + *(DATE *)src = 10.7500; + hr = IDataConvert_DataConvert(convert, DBTYPE_DATE, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 11, "got %08x\n", i4); + + i4 = 0x12345678; + b = SysAllocString(ten); + *(BSTR *)src = b; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 10, "got %08x\n", i4); + SysFreeString(b); + + i4 = 0x12345678; + *(SCODE *)src = 0x4321cafe; + hr = IDataConvert_DataConvert(convert, DBTYPE_ERROR, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); +} + ok(i4 == 0x12345678, "got %08x\n", i4); + +todo_wine +{ + i4 = 0x12345678; + *(VARIANT_BOOL *)src = VARIANT_TRUE; + hr = IDataConvert_DataConvert(convert, DBTYPE_BOOL, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 0xffffffff, "got %08x\n", i4); + + i4 = 0x12345678; + *(VARIANT_BOOL *)src = VARIANT_FALSE; + hr = IDataConvert_DataConvert(convert, DBTYPE_BOOL, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 0, "got %08x\n", i4); + + i4 = 0x12345678; + V_VT((VARIANT*)src) = VT_I2; + V_I2((VARIANT*)src) = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 0x1234, "got %08x\n", i4); + + i4 = 0x12345678; + *(signed char*)src = 0xab; + hr = IDataConvert_DataConvert(convert, DBTYPE_I1, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 0xffffffab, "got %08x\n", i4); + + i4 = 0x12345678; + *(BYTE*)src = 0xab; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI1, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 0xab, "got %08x\n", i4); + + i4 = 0x12345678; + *(WORD*)src = 0xabcd; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI2, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 0xabcd, "got %08x\n", i4); + + i4 = 0x12345678; + *(DWORD*)src = 0xabcd1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); +} + ok(i4 == 0x12345678, "got %08x\n", i4); + +todo_wine +{ + i4 = 0x12345678; + *(DWORD*)src = 0x1234abcd; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 0x1234abcd, "got %08x\n", i4); + + i4 = 0x12345678; + strcpy((char *)src, "10"); + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_I4, 2, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 10, "got %08x\n", i4); + + i4 = 0x12345678; + strcpy((char *)src, "10"); + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 10, "got %08x\n", i4); + + i4 = 0x12345678; + memcpy(src, ten, sizeof(ten)); + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_I4, 4, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 10, "got %08x\n", i4); + + i4 = 0x12345678; + memcpy(src, ten, sizeof(ten)); + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(i4), "got %d\n", dst_len); + ok(i4 == 10, "got %08x\n", i4); +} + + IDataConvert_Release(convert); +} + + START_TEST(convert) { OleInitialize(NULL); test_dcinfo(); test_canconvert(); + test_converttoi4(); OleUninitialize(); }

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2009