wine-devel November 2014

48 participants
175 discussions

Re: [PATCH] vbscript: Implemented String(try 2)
by Piotr Caban 02 Nov '14

02 Nov '14

Hi, Some of the tests are not working on windows: E:\>vbscript_crosstest.exe run run.c:1043: Test failed: api.vbs: L"String(1, 564) = 4" run.c:1043: Test failed: api.vbs: L"String(1, 16895.49) = \00ff" run.c:1043: Test failed: api.vbs: L"String(1, CSng(16895.5)) = " run.c:1043: Test failed: api.vbs: L"755826670, w: Err.number = 0" run: 26885 tests executed (0 marked as todo, 4 failures), 0 skipped. On 10/25/14 10:10, Shuai Meng wrote: > +Call ok(String(1, 65.5) = "B", "String(1, 65.5) = " & String(1, 65.5)) > +Call ok(getVT(String(1, 65.5)) = "VT_BSTR", "getVT(String(1, 65.5)) = " & getVT(String(1, 65.5))) > +Call ok(String(1, 66.5) = "B", "String(1, 66.5) = " & String(1, 66.5)) > +Call ok(getVT(String(1, 66.5)) = "VT_BSTR", "getVT(String(1, 66.5)) = " & getVT(String(1, 66.5))) You have added exactly the same test twice. > +Call testStringError(2147483648, "w", 6) > +Call testStringError(2147483647, "w", 5) > +Call testStringError(1073741824, "w", 5) > +Call testStringError(1073741823, "w", 14) > +Call testStringError(755826670, "w", 14) > +Call testStringError(755826669, "w", 0) You can't assume it's possible to allocate ~700mb of memory in tests. The function never returns E_OUTOFMEMORY. You can't test it in wine tests suite but you can see it by calling the function in loop until system runs out of memory and then checking the error. You should simply try to allocate the string and if it fails return VBSE_OUT_OF_STRING_SPACE. Cheers, Piotr

3 3

Re: [1/2] ddraw: add dsurface dimension tests, try 12
by Stefan Dösinger 02 Nov '14

02 Nov '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, First of all, thanks for your endurance with this. I know our pickiness can be exhausting. Am 2014-10-30 19:39, schrieb Patrick Rudolph: > + ddcaps.dwSize = sizeof(DDCAPS); > + hr = IDirectDraw_GetCaps(ddraw, &ddcaps, NULL); > + ok(SUCCEEDED(hr), "IDirectDraw_GetCaps failed, hr %#x.\n", hr); You are never reading ddcaps. I suspect it is a leftover from the now-removed out of (video)memory tests. > + surfacedesc.dwFlags = tests[i].flags | DDSD_PIXELFORMAT; You are already setting DDSD_PIXELFORMAT in all of tests[i].flags, there's no need to set it twice. Remove one of them, preferably the one in tests[].flags. You can move DDSD_CAPS as well. Henri mentioned the same issue in his feedback. The rest are some minor style issues, but please fix them as well: > + DWORD i,j; I'd prefer unsigned int i, j, but that's not a strong opinion. > + todo_wine ok(hr == tests[i].hr || broken(hr == DDERR_INVALIDPARAMS), "Pixelformat %s, test %d returned %08x\n", formats[j].name, i, hr); i is unsigned, print it with %u. > + hr = IDirectDraw_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(SUCCEEDED(hr), "CreateSurface returned %08x\n", hr); > + > + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surfacedesc); > + ok(SUCCEEDED(hr), "GetSurfaceDesc returned %x\n", hr); Please be consistent with the format you use. Tests added in recent years use %#x, I recommend to use this. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUVkaEAAoJEN0/YqbEcdMwPVoQAJTppEl15dBZ6uVCBmOYEzbg W5GYcDfdjv9/j4S6cVyHh0wKQF7eoHBdVelF8IvE47rBGBoe63YZnOuozEN1JPNL 7buCVNBof+1WytRAZacIyu9O4Vbs2bLXgGlGqo4T0baQbQMKoH/gQnyEXcxmJR6s egElATCH1RvInllwuIPbtSr+RcmH+m8Tk9LRzHNU6gKcXNwdNv1iicQaD+wF3S2F +iG7va1Sy6ubeDHEX8CE3EMhHyFmcZZlsqk2G6AVJcj914+I8VNua69XVCujkdaH atkZQ1bS8HQ9nzfrc+X7G5CI6ZsGfO2UA8mtjl1rf8OzoCgCZ8lZmjdhgD40iQVX boFXmsFGMZAYDVxu/aUX2qD4NtBkE4TlF9JVy8UA0QMWd1DN1SyjO77lp6197VGV bAaDhjID8bUyaTc6m314eOiKMuM+2Nyt6aGwT87uyTffKCM2Eyt692tB3xWH6IqT nJpctMa724qOoAmRL5jca99uDTrn6iKkUa7m8hMXgRQEjyQvd9fm+wbNmRrxGfmA 59IwxFHF5IKTsQVbkDaLvXfU2n9ubvA0cyXRFAP1YLI9pDKq1/I3ORmToYIJ0D6O k7AqX0/7nrnu0uJEDhP3/AsTMs2Ldvh1MavNxUIWOcDK4PCc/Ga9PBc6ubX4FQGI i3iQC8eR0aQrlYAr5lvj =6YE6 -----END PGP SIGNATURE-----

1 0

Re: [PATCH] cmd/tests: Add tests for 'del' (Fixes bug 35970)
by Marvin 02 Nov '14

02 Nov '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9945 Your paranoid android. === wxppro (32 bit) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 689 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 690 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 691 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 692 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 693 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 694 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 695 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 696 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 697 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 698 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 699 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 700 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 701 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 702 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 703 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 704 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 705 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 706 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 707 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 708 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 709 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 710 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 711 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 712 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 713 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 715 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 716 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 717 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 718 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 719 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 720 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 721 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 722 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 723 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 724 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 725 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 726 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 727 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 728 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 729 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 730 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 731 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 732 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 733 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 734 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 735 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 736 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 737 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 738 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 739 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 740 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 741 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 742 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 743 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 744 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 745 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 746 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 747 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 748 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 749 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 750 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 751 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 752 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 753 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 755 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 756 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 757 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 758 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 759 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 760 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 761 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 762 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 763 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 764 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 765 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 766 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 767 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 768 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 769 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 770 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 771 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 772 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 773 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 774 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 775 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 776 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 778 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 779 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 780 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1368 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1369 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1370 (got 'C:\Documents and Settings\winetest\My Documents\foobar\foodir2', wanted '@drive@@path@foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1371 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1372 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1373 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1374 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1375 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1377 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1380 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1381 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1382 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1383 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1384 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1385 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1386 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar') === wvistau64 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'') === w8 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--------'', wanted ''--a------'@or_broken@'%~ai'') === wvistau64 (64 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'')

2 1

Re: [2/2] oleaut32: Implement TLB dependencies lookup in resources (resend 3 - last submit before abandon)
by Guillaume Charifi 01 Nov '14

01 Nov '14

Thanks a lot for your reply, I have nothing to add, so I'm about to submit just your fixed version.Thanks to Alexander and Andrew too.

1 0

Re: [2/2] oleaut32: Implement TLB dependencies lookup in resources (resend 3 - last submit before abandon)
by Sebastian Lackner 01 Nov '14

01 Nov '14

I had this patch on my list for a couple of weeks, and finally had time to take a closer look. There were still a lot of issues. I've listed them below, and have also added a fixed version to our staging tree: https://github.com/wine-compholio/wine-staging/blob/master/patches/oleaut32… Feel free to integrate my changes and resubmit if you like. On 27.09.2014 20:10, Guillaume Charifi wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=34184 > > This is the last time without a review before I give up. > > --- dlls/oleaut32/tests/typelib.c | 2 +- > dlls/oleaut32/typelib.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- > 2 files changed, 103 insertions(+), 10 deletions(-) > > >diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c >index cb5bc23..99e2aedd 100644 >--- a/dlls/oleaut32/tests/typelib.c >+++ b/dlls/oleaut32/tests/typelib.c >@@ -5595,7 +5595,7 @@ static void test_dep(void) { > ok(hr == S_OK, "got: %x\n", hr); > > hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); >- todo_wine ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); >+ ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); > > ITypeInfo_Release(ptInfo); > if(ptInfoExt) >diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c >index 48b171b..d895696 100644 >--- a/dlls/oleaut32/typelib.c >+++ b/dlls/oleaut32/typelib.c >@@ -7572,6 +7572,84 @@ static HRESULT ITypeInfoImpl_GetDispatchRefTypeInfo( ITypeInfo *iface, > return E_FAIL; > } > >+struct search_res_tlb_param { >+ GUID *guid; GUID should be const. >+ ITypeLib *pTLib; >+ HRESULT result; >+}; There is no need to store 'result' here. If the lookup fails the result is not used anyway. Comparing pTlib != NULL should be sufficient. >+ >+static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszIntName, LONG_PTR lParam) >+{ >+ struct search_res_tlb_param *This = (LPVOID)lParam; >+ >+ HRESULT ret; >+ >+ static WCHAR resFormatStrW[] = {'\\','%','d',0}; Should be const. >+ WCHAR szPath[MAX_PATH]; >+ WCHAR szTLBPath[MAX_PATH]; >+ WCHAR szStringName[12]; >+ LPVOID pBase = NULL; >+ DWORD dwTLBLength = 0; >+ IUnknown *pFile = NULL; >+ ITypeLib2 *pTLib = NULL; >+ RPC_STATUS rpc_stat; >+ >+ This->pTLib = NULL; >+ This->result = E_FAIL; >+ >+ if(IS_INTRESOURCE(lpszIntName) == FALSE) >+ return TRUE; >+ >+ GetModuleFileNameW(hModule, szPath, MAX_PATH); Missing error checks. >+ >+ strcpyW(szTLBPath, szPath); >+ snprintfW(szStringName, sizeof(szStringName)/sizeof(WCHAR), resFormatStrW, PtrToInt(lpszIntName)); >+ strcatW(szTLBPath, szStringName); Here also missing error checks. Moreover copying the data all the time is a bit ugly. >+ >+ ret = TLB_PEFile_Open(szPath, PtrToInt(lpszIntName), &pBase, &dwTLBLength, &pFile); >+ if (ret == TYPE_E_CANTLOADLIBRARY) >+ ret = TLB_NEFile_Open(szPath, PtrToInt(lpszIntName), &pBase, &dwTLBLength, &pFile); >+ if (ret == TYPE_E_CANTLOADLIBRARY) >+ ret = TLB_Mapping_Open(szPath, &pBase, &dwTLBLength, &pFile); >+ if (SUCCEEDED(ret)) >+ { >+ if (dwTLBLength >= 4) >+ { >+ DWORD dwSignature = FromLEDWord(*((DWORD*) pBase)); >+ if (dwSignature == MSFT_SIGNATURE) >+ pTLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength); >+ else if (dwSignature == SLTG_SIGNATURE) >+ pTLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); >+ else >+ { >+ FIXME("Header type magic 0x%08x not supported.\n", dwSignature); >+ ret = E_FAIL; >+ } >+ } >+ else >+ ret = E_FAIL; >+ IUnknown_Release(pFile); >+ } As already pointed out by Alexandre, this whole block is duplicated, although that is not really necessary. You can just call existing functions to load the typelib, SearchPathW will have no influence when its an absolute path. >+ >+ if(pTLib) { >+ ITypeLibImpl *impl = impl_from_ITypeLib2(pTLib); >+ ret = UuidEqual((UUID *)This->guid, (UUID *)TLB_get_guid_null(impl->guid), &rpc_stat); Why casting and using this API? The rest of the file uses IsEqualGUID. This also allows to get rid of the dummy rpc_stat variable. Moreover you are storing a BOOL value in a HRESULT variable. >+ ITypeLib_Release((ITypeLib *)pTLib); >+ >+ ret = (ret == TRUE) ? LoadTypeLibEx(szTLBPath, REGKIND_NONE, (ITypeLib **)&pTLib) : E_FAIL; That is especially ugly, because you free the library, just to load it again immediately afterwards. I don't think there is any good reason to do that, correct me if I'm wrong. >+ } >+ >+ This->result = ret; >+ >+ if(SUCCEEDED(ret)) { >+ /* If found, stop to enumerate */ >+ This->pTLib = (ITypeLib *)pTLib; >+ return FALSE; >+ } >+ >+ return TRUE; >+} >+ > /* ITypeInfo::GetRefTypeInfo > * > * If a type description references other type descriptions, it retrieves >@@ -7665,20 +7743,35 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( > ITypeLib_AddRef(pTLib); > result = S_OK; > } else { >+ static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; >+ struct search_res_tlb_param param; > BSTR libnam; > > TRACE("typeinfo in imported typelib that isn't already loaded\n"); > >- result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), >- ref_type->pImpTLInfo->wVersionMajor, >- ref_type->pImpTLInfo->wVersionMinor, >- This->pTypeLib->syskind, >- ref_type->pImpTLInfo->lcid, &libnam, TRUE); >- if(FAILED(result)) >- libnam = SysAllocString(ref_type->pImpTLInfo->name); >+ /* Search in resource table */ >+ param.guid = (GUID *)TLB_get_guid_null(ref_type->pImpTLInfo->guid); You are casting away the const here. Normally there is no cast required at all. >+ param.pTLib = NULL; >+ param.result = E_FAIL; >+ >+ EnumResourceNamesW(NULL, TYPELIBW, search_res_tlb, (LONG_PTR)&param); >+ >+ pTLib = param.pTLib; >+ result = param.result; > >- result = LoadTypeLib(libnam, &pTLib); >- SysFreeString(libnam); >+ /* Search on disk */ >+ if(FAILED(result)) { >+ result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), >+ ref_type->pImpTLInfo->wVersionMajor, >+ ref_type->pImpTLInfo->wVersionMinor, >+ This->pTypeLib->syskind, >+ ref_type->pImpTLInfo->lcid, &libnam, TRUE); >+ if(FAILED(result)) >+ libnam = SysAllocString(ref_type->pImpTLInfo->name); >+ >+ result = LoadTypeLib(libnam, &pTLib); >+ SysFreeString(libnam); >+ } > > if(SUCCEEDED(result)) { > ref_type->pImpTLInfo->pImpTypeLib = impl_from_ITypeLib(pTLib);

1 0

Jump to page:

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-devel November 2014