February 2011 - Wine-commits

Austin English : hlink/tests: Don't check results in disabled tests (LLVM/ Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: f41a70133a42879c1c3edd01033f11e7d89effee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41a70133a42879c1c3edd010… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:57:39 2011 -0800 hlink/tests: Don't check results in disabled tests (LLVM/Clang). --- dlls/hlink/tests/hlink.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index bb44080..d151aa5 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1105,9 +1105,9 @@ static void test_HlinkGetSetMonikerReference(void) CoTaskMemFree(found_loc); /* invalid HLINKSETF flags */ - hres = IHlink_SetMonikerReference(hlink, 12, dummy2, two); /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */ - if (0) ok(hres == 12, "IHlink_SetMonikerReference should've failed with 0x%08x, failed with 0x%08x\n", 12, hres); + if (0) + IHlink_SetMonikerReference(hlink, 12, dummy2, two); hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); ok(hres == S_OK, "IHlink_GetMonikerReference failed: 0x%08x\n", hres); @@ -1260,12 +1260,12 @@ static void test_HlinkGetSetStringReference(void) CoTaskMemFree(fnd_tgt); CoTaskMemFree(fnd_loc); - hres = IHlink_SetStringReference(link, 4, NULL, NULL); - /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */ - if (0) ok(hres == 4, "IHlink_SetStringReference should have failed with 0x4, instead: 0x%08x\n", hres); - - hres = IHlink_SetStringReference(link, -4, NULL, NULL); - if (0) ok(hres == -4, "IHlink_SetStringReference should have failed with 0xFFFFFFFC, instead: 0x%08x\n", hres); + if (0) + { + /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */ + IHlink_SetStringReference(link, 4, NULL, NULL); + IHlink_SetStringReference(link, -4, NULL, NULL); + } IHlink_Release(link); } @@ -1730,12 +1730,12 @@ static void test_HlinkClone(void) hres = HlinkClone(hl, &IID_IHlink, NULL, 0, NULL); ok(hres == E_INVALIDARG, "Got wrong failure code: %08x\n", hres); - if(0){ /* crash on Windows XP */ - hres = HlinkClone(hl, NULL, NULL, 0, NULL); - ok(hres == E_INVALIDARG, "Got wrong failure code: %08x\n", hres); + if (0) + { + /* crash on Windows XP */ + HlinkClone(hl, NULL, NULL, 0, NULL); - hres = HlinkClone(hl, NULL, NULL, 0, (void**)&cloned); - ok(hres == E_INVALIDARG, "Got wrong failure code: %08x\n", hres); + HlinkClone(hl, NULL, NULL, 0, (void**)&cloned); } hres = HlinkClone(hl, &IID_IHlink, NULL, 0, (void**)&cloned);

1 0

Austin English : qmgr/tests: Make sure return values are used (LLVM/Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 69fd8d52715bdd6095b266ff6d2b35e630859dbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=69fd8d52715bdd6095b266ff6… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:58:45 2011 -0800 qmgr/tests: Make sure return values are used (LLVM/Clang). --- dlls/qmgr/tests/qmgr.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/qmgr/tests/qmgr.c b/dlls/qmgr/tests/qmgr.c index 6dc9c1c..092d009 100644 --- a/dlls/qmgr/tests/qmgr.c +++ b/dlls/qmgr/tests/qmgr.c @@ -208,6 +208,7 @@ static void test_globalness(void) BOOL found = FALSE; hres = IEnumBackgroundCopyJobs_GetCount(enumJobs, &n); + ok(hres == S_OK, "GetCount failed: %08x\n", hres); for (i = 0; i < n && !found; ++i) { LPWSTR name; @@ -219,6 +220,7 @@ static void test_globalness(void) IBackgroundCopyJob_Release(job); } hres = IEnumBackgroundCopyJobs_Release(enumJobs); + ok(hres == S_OK, "Release failed: %08x\n", hres); ok(found, "Adding a job in another process failed\n"); }

1 0

Austin English : cryptui/tests: Remove a dead assignment (LLVM/Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: ed778bc8e154f1debeec395cf2d37b599f45ca4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed778bc8e154f1debeec395cf… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 18:27:16 2011 -0800 cryptui/tests: Remove a dead assignment (LLVM/Clang). --- dlls/cryptui/tests/cryptui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 996df0e..09b246c 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -344,7 +344,7 @@ static void test_crypt_ui_wiz_import(void) /* Brings up UI. Cancelling yields ret = 1. */ if (0) { - ret = pCryptUIWizImport(0, 0, NULL, NULL, NULL); + pCryptUIWizImport(0, 0, NULL, NULL, NULL); } SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, NULL, NULL);

1 0

Peter Urbanec : setupapi: Fix comparison issue on 64-bit systems.
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: de83ea61bbc72976326130c70f85e25f0633752a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de83ea61bbc72976326130c70… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Tue Feb 8 15:58:43 2011 +1100 setupapi: Fix comparison issue on 64-bit systems. --- dlls/setupapi/setupcab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 77f2b59..f4c6600 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -412,7 +412,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p TRACE("(fdint == %d, pfdin == ^%p)\n", fdint, pfdin); - if (pfdin && pfdin->pv && (*((void **) pfdin->pv) == (void *)SC_HSC_W_MAGIC)) + if (pfdin && pfdin->pv && (((PSC_HSC_W) pfdin->pv)->magic == SC_HSC_W_MAGIC)) phsc = pfdin->pv; else { ERR("pv %p is not an SC_HSC_W.\n", (pfdin) ? pfdin->pv : NULL);

1 0

Alistair Leslie-Hughes : mshtml: Implemented IHTMLStyle_put_borderBottomColor.
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 56e80e18a60a1660093626cfeaf0784790ba2a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e80e18a60a1660093626cfe… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 5 02:47:10 2011 +1100 mshtml: Implemented IHTMLStyle_put_borderBottomColor. --- dlls/mshtml/htmlstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 45efd95..d2c79c8 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1577,8 +1577,10 @@ static HRESULT WINAPI HTMLStyle_get_borderRightColor(IHTMLStyle *iface, VARIANT static HRESULT WINAPI HTMLStyle_put_borderBottomColor(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_BOTTOM_COLOR, &v, ATTR_HEX_INT); } static HRESULT WINAPI HTMLStyle_get_borderBottomColor(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b5babed..062507e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5479,6 +5479,24 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_borderRightColor(style, vDefault); ok(hres == S_OK, "putborderRightColorr: %08x\n", hres); + /* borderBottomColor */ + hres = IHTMLStyle_get_borderBottomColor(style, &vDefault); + ok(hres == S_OK, "get_borderBottomColor: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("cyan"); + hres = IHTMLStyle_put_borderBottomColor(style, v); + ok(hres == S_OK, "put_borderBottomColor: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_borderBottomColor(style, &v); + ok(hres == S_OK, "get_borderBottomColor: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "cyan"), "expected cyan = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_borderBottomColor(style, vDefault); + ok(hres == S_OK, "put_borderBottomColor: %08x\n", hres); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

André Hentschel : oleaut32/tests: Add more safearray tests.
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 1a37f6e9405c0fe97d59847f8fcd7cda619276b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a37f6e9405c0fe97d59847f8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 7 20:44:43 2011 +0100 oleaut32/tests: Add more safearray tests. --- dlls/oleaut32/tests/safearray.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 97ba9dd..849bd01 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1590,13 +1590,30 @@ static void test_SafeArrayCopy(void) hres = SafeArrayAllocDescriptor(1, &sa); ok(hres == S_OK, "SafeArrayAllocDescriptor failed with error 0x%08x\n", hres); + sa->cbElements = 16; + hres = SafeArrayCopy(sa, &sa2); + ok(hres == S_OK, "SafeArrayCopy failed with error 0x%08x\n", hres); + ok(sa != sa2, "SafeArrayCopy performed shallow copy\n"); + + hres = SafeArrayDestroy(sa2); + ok(hres == S_OK, "got 0x%08x\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + + sa2 = (void*)0xdeadbeef; + hres = SafeArrayCopy(NULL, &sa2); + ok(hres == S_OK, "SafeArrayCopy failed with error 0x%08x\n", hres); + ok(!sa2, "SafeArrayCopy didn't return NULL for output array\n"); + + hres = SafeArrayAllocDescriptor(1, &sa); + ok(hres == S_OK, "SafeArrayAllocDescriptor failed with error 0x%08x\n", hres); + + sa2 = (void*)0xdeadbeef; hres = SafeArrayCopy(sa, &sa2); ok(hres == E_INVALIDARG, "SafeArrayCopy with empty array should have failed with error E_INVALIDARG instead of 0x%08x\n", hres); - sa->cbElements = 16; - hres = SafeArrayCopy(sa, &sa2); - ok(hres == S_OK, "SafeArrayCopy failed with error 0x%08x\n", hres); + ok(!sa2, "SafeArrayCopy didn't return NULL for output array\n"); hres = SafeArrayDestroy(sa2); ok(hres == S_OK, "got 0x%08x\n", hres);

1 0

Rico Schüller : d3dcompiler: Parse OSG5 in the reflection interface.
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 19fea20963ba0020bea8ba32431edb50897555f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fea20963ba0020bea8ba324… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 6 21:56:35 2011 +0100 d3dcompiler: Parse OSG5 in the reflection interface. --- dlls/d3dcompiler_43/reflection.c | 55 ++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 4b0467a..96adb04 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -25,6 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); +enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE +{ + D3DCOMPILER_SIGNATURE_ELEMENT_SIZE6 = 6, + D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7 = 7, +}; + static BOOL copy_name(const char *ptr, char **name) { size_t name_len; @@ -538,15 +544,34 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c return S_OK; } -HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, const char *data, DWORD data_size) +HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, struct dxbc_section *section) { D3D11_SIGNATURE_PARAMETER_DESC *d; unsigned int string_data_offset; unsigned int string_data_size; - const char *ptr = data; + const char *ptr = section->data; char *string_data; unsigned int i; DWORD count; + enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE element_size; + + switch (section->tag) + { + case TAG_OSG5: + element_size = D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7; + break; + + case TAG_ISGN: + case TAG_OSGN: + case TAG_PCSG: + element_size = D3DCOMPILER_SIGNATURE_ELEMENT_SIZE6; + break; + + default: + FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); + element_size = D3DCOMPILER_SIGNATURE_ELEMENT_SIZE6; + break; + } read_dword(&ptr, &count); TRACE("%u elements\n", count); @@ -560,9 +585,10 @@ HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, cons return E_OUTOFMEMORY; } - /* 2 DWORDs for the header, 6 for each element. */ - string_data_offset = 2 * sizeof(DWORD) + count * 6 * sizeof(DWORD); - string_data_size = data_size - string_data_offset; + /* 2 DWORDs for the header, element_size for each element. */ + string_data_offset = 2 * sizeof(DWORD) + count * element_size * sizeof(DWORD); + string_data_size = section->data_size - string_data_offset; + string_data = HeapAlloc(GetProcessHeap(), 0, string_data_size); if (!string_data) { @@ -570,15 +596,21 @@ HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, cons HeapFree(GetProcessHeap(), 0, d); return E_OUTOFMEMORY; } - memcpy(string_data, data + string_data_offset, string_data_size); + memcpy(string_data, section->data + string_data_offset, string_data_size); for (i = 0; i < count; ++i) { UINT name_offset; DWORD mask; - /* todo: Parse stream in shaderblobs v5 (dx11) */ - d[i].Stream = 0; + if (element_size == D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7) + { + read_dword(&ptr, &d[i].Stream); + } + else + { + d[i].Stream = 0; + } read_dword(&ptr, &name_offset); d[i].SemanticName = string_data + (name_offset - string_data_offset); @@ -675,7 +707,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->isgn, section->data, section->data_size); + hr = d3dcompiler_parse_signature(reflection->isgn, section); if (FAILED(hr)) { WARN("Failed to parse section ISGN.\n"); @@ -683,6 +715,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection } break; + case TAG_OSG5: case TAG_OSGN: reflection->osgn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*reflection->osgn)); if (!reflection->osgn) @@ -692,7 +725,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->osgn, section->data, section->data_size); + hr = d3dcompiler_parse_signature(reflection->osgn, section); if (FAILED(hr)) { WARN("Failed to parse section OSGN.\n"); @@ -709,7 +742,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->pcsg, section->data, section->data_size); + hr = d3dcompiler_parse_signature(reflection->pcsg, section); if (FAILED(hr)) { WARN("Failed to parse section PCSG.\n");

1 0

Austin English : dsound/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 8c771e3f7e39caaac0a192d32e19d6f0492d138c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c771e3f7e39caaac0a192d32… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:57:29 2011 -0800 dsound/tests: Make sure to use return values (LLVM/Clang). --- dlls/dsound/tests/ds3d8.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index aa72648..41de792 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -648,7 +648,10 @@ static HRESULT test_secondary8(LPGUID lpGuid, int play, "IDirectSound8_CreateSoundBuffer(secondary) should have " "returned DSERR_INVALIDPARAM, returned %08x\n", rc); if (secondary) + { ref=IDirectSoundBuffer_Release(secondary); + ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, should have 0\n",ref); + } init_format(&wfx,WAVE_FORMAT_PCM,22050,16,1); }

1 0

Austin English : fusion/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 262dab84183549f8f8ae45ac2239433feedd6d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262dab84183549f8f8ae45ac2… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:57:35 2011 -0800 fusion/tests: Make sure to use return values (LLVM/Clang). --- dlls/fusion/tests/asmname.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 170af23..a99b288 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -745,6 +745,7 @@ static void test_CreateAssemblyNameObject(void) to_widechar(namestr, "wine, processorArchitecture=AMD64"); name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_PROCESSORARCHITECTURE); @@ -758,6 +759,7 @@ static void test_CreateAssemblyNameObject(void) to_widechar(namestr, "wine, processorArchitecture=IA64"); name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_PROCESSORARCHITECTURE); @@ -771,6 +773,7 @@ static void test_CreateAssemblyNameObject(void) to_widechar(namestr, "wine, processorArchitecture=MSIL"); name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_PROCESSORARCHITECTURE);

1 0

Austin English : msvcrt/tests: Make sure return values are used (LLVM/Clang ).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 2164bb7a7fd5ffb007cc4e1b58f77a296c04c8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2164bb7a7fd5ffb007cc4e1b5… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:58:09 2011 -0800 msvcrt/tests: Make sure return values are used (LLVM/Clang). --- dlls/msvcrt/tests/scanf.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index e9cb987..cbfb184 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -93,11 +93,14 @@ static void test_sscanf( void ) /* Check float */ ret = sprintf(buffer,"%f %f",res1, res2); + ok( ret == 20, "expected 20, got %u\n", ret); ret = sscanf(buffer,"%f%f",&res11, &res12); + ok( ret == 2, "expected 2, got %u\n", ret); ok( (res11 == res1) && (res12 == res2), "Error reading floats\n"); /* check strings */ ret = sprintf(buffer," %s", pname); + ok( ret == 26, "expected 26, got %u\n", ret); ret = sscanf(buffer,"%*c%[^\n]",buffer1); ok( ret == 1, "Error with format \"%s\"\n","%*c%[^\n]"); ok( strncmp(pname,buffer1,strlen(buffer1)) == 0, "Error with \"%s\" \"%s\"\n",pname, buffer1); @@ -112,6 +115,7 @@ static void test_sscanf( void ) /* check digits */ ret = sprintf(buffer,"%d:%d:%d",hour,min,sec); + ok( ret == 8, "expected 8, got %u\n", ret); ret = sscanf(buffer,"%d%n",&number,&number_so_far); ok(ret == 1 , "problem with format arg \"%%d%%n\"\n"); ok(number == hour,"Read wrong arg %d instead of %d\n",number, hour);

1 0