- Wine-devel - list.winehq.org

Tests for URL functions in shlwapi
by Matthew Mastracci 01 Jan '03

01 Jan '03

I've started on some tests in shlwapi. I've added the following file to the tests directory under shlwapi, but I can't include it in a cvs diff, because I don't have write access to the repository. Any hints as to diffing a new file cleanly w/o write access to CVS? These tests compile and run clean with the last CVS tree I pulled (a few days ago). I need to flesh them out, but it's a start. Here is the diff for the Makefile.in: cvs server: Diffing dlls/shlwapi/tests Index: dlls/shlwapi/tests/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/shlwapi/tests/Makefile.in,v retrieving revision 1.2 diff -u -r1.2 Makefile.in --- dlls/shlwapi/tests/Makefile.in 12 Nov 2002 01:13:10 -0000 1.2 +++ dlls/shlwapi/tests/Makefile.in 31 Dec 2002 20:51:24 -0000 @@ -8,7 +8,8 @@ CTESTS = \ clist.c \ generated.c \ - shreg.c + shreg.c \ + url.c @MAKE_TEST_RULES@ --- 8< --- And the entire file for url.c in dlls/shlwapi/tests/url.c: --- 8< --- /* Unit test suite for Url* functions * * Copyright 2002 Matthew Mastracci * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <assert.h> #include <stdlib.h> #include <stdio.h> #include "wine/test.h" #include "wine/unicode.h" #include "winbase.h" #include "shlwapi.h" #include "wininet.h" const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; const char* TEST_URL_3 = "http://foo:bar(a)localhost:21/internal.php?query=x&return=y"; static LPWSTR GetWideString(const char* szString) { LPWSTR wszString = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); MultiByteToWideChar(0, 0, szString, -1, wszString, INTERNET_MAX_URL_LENGTH); return wszString; } static void FreeWideString(LPWSTR wszString) { HeapFree(GetProcessHeap(), 0, wszString); } static void hash_url(const char* szUrl) { LPCSTR szTestUrl = szUrl; LPWSTR wszTestUrl = GetWideString(szTestUrl); DWORD cbSize = sizeof(DWORD); DWORD dwHash1, dwHash2; ok(UrlHashA(szTestUrl, (LPBYTE)&dwHash1, cbSize) == S_OK, "UrlHashA didn't return S_OK"); ok(UrlHashW(wszTestUrl, (LPBYTE)&dwHash2, cbSize) == S_OK, "UrlHashW didn't return S_OK"); FreeWideString(wszTestUrl); ok(dwHash1 == dwHash2, "Hashes didn't compare"); } static void test_UrlHash(void) { hash_url(TEST_URL_1); hash_url(TEST_URL_2); hash_url(TEST_URL_3); } static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, char* szExpected) { CHAR szPart[INTERNET_MAX_URL_LENGTH]; WCHAR wszPart[INTERNET_MAX_URL_LENGTH]; LPWSTR wszUrl = GetWideString(szUrl); LPWSTR wszConvertedPart; DWORD dwSize; dwSize = INTERNET_MAX_URL_LENGTH; ok( UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags) == S_OK, "UrlGetPartA didn't return S_OK" ); dwSize = INTERNET_MAX_URL_LENGTH; ok( UrlGetPartW(wszUrl, wszPart, &dwSize, dwPart, dwFlags) == S_OK, "UrlGetPartW didn't return S_OK" ); wszConvertedPart = GetWideString(szPart); ok(strcmpW(wszPart,wszConvertedPart)==0, "Strings didn't match between ascii and unicode UrlGetPart!"); FreeWideString(wszUrl); FreeWideString(wszConvertedPart); ok(strcmp(szPart,szExpected)==0, "Expected %s, but got %s", szExpected, szPart); } static void test_UrlGetPart(void) { test_url_part(TEST_URL_3, URL_PART_HOSTNAME, 0, "localhost"); test_url_part(TEST_URL_3, URL_PART_PORT, 0, "21"); test_url_part(TEST_URL_3, URL_PART_USERNAME, 0, "foo"); test_url_part(TEST_URL_3, URL_PART_PASSWORD, 0, "bar"); test_url_part(TEST_URL_3, URL_PART_SCHEME, 0, "http"); test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "?query=x&return=y"); } START_TEST(url) { test_UrlHash(); test_UrlGetPart(); } -- Matthew Mastracci <matt(a)aclaro.com>

2 1

stricmp
by Shachar Shemesh 01 Jan '03

01 Jan '03

Hi, It seems that stricmp is not available for winelib applications. Is this an intentional ommision, or just a missing implementation? Shachar

3 4

running confirmance tests, question
by Sylvain Petreolle 01 Jan '03

01 Jan '03

Looking at http://fgouget.free.fr/wine/tests-en.shtml, I downloaded & ran the precompiled tests. Are them updated to ensure results in sync with the current CVS ? Is there a way to compile tests under Cygwin ? Looking into doc doesnt say that. What data should be reported when seeing "invalid test" in current results on the web page (running XP here) ? Best wishes. ===== Sylvain Petreolle spetreolle(a)users.sourceforge.net Fight against Spam ! http://www.euro.cauce.org/en/index.html ICQ #170597259 "Don't think you are. Know you are." Morpheus in Matrix, chapter 15. ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

Re: fptest.exe output W98SE
by Drew Ogle 01 Jan '03

01 Jan '03

I was exploring what was making win2k's cmd.exe crash, and I had found a problem in GetFullPathName, so I wrote a test. AndiM nicly ran it for me in win98se. Andreas Mohr wrote: >Hi, > >A:\>fptest >C:\ returned 3 and C:\ in buf, and 00000000 is the s pointer. >C:\\ returned 4 and C:\\ in buf, and 00000000 is the s pointer. >C:\.. returned 3 and C:\ in buf, and 00000000 is the s pointer. >C:\\.. returned 4 and C:\\ in buf, and 00000000 is the s pointer. >C:\Program Files\.. returned 3 and C:\ in buf, and 00000000 is the s ptr. >C:\\Program Files\.. returned 4 and C:\\ in buf, and 00000000 is the s ptr. >C:\blargzool urned 14 and C:\blargazoool in buf, and 0073FCD3 is the s ptr. > >HTH, > >Andi > > On the XP machine I have, C:\\ returns C:\ and C:\\.. returns C:\ I did not modify any code yet, but instead bring it up here as possibly something we need to have code that behaves differently to mimic different windows versions -Dante

2 2

Win98 Compliance Status
by Mathew McBride 01 Jan '03

01 Jan '03

I downloaded and ran the Wine Comformance tests from http://fgouget.free.fr/wine/winetests.zip Dr. Watson (drwatson.exe) was enabled advapi32_test.exe/registry crash DrWatson: The application overflowed its temporary memory area. Module Name: ADVAPI32_TEST.E Application Name: Advapi32_test.exe dsound_text.exe I don't have msvcrtd.dll (where can I get it) REQUEST: Is it possible to compile these tests using mingw32. gdi32_test.exe/generated 2786 tests executed, 0 marked as todo, 0 failures kernel32_test.exe/alloc alloc.c:208: Test failed: GlobalReAlloc failed to convert FIXED to MOVEABLE: err or=87 alloc.c:213: Test failed: Converting from FIXED to MOVEABLE didn't REALLY work alloc.c:238: Test failed: Discarded memory we shouldn't have alloc.c:239: Test failed: GlobalUnlock Failed. alloc: 58 tests executed, 0 marked as todo, 4 failures. kernel32_test.exe/atom atom.c:55:WARNING: Unicode atom APIs are not supported on this platform atom: 163850 tests executed, 0 marked as todo, 0 failures. kernel32_test.exe/codepage 2 tests executed, 0 marked as todo, 0 failures kernel32_test.exe/directory 25 tests executed, 0 todo, 0 failures kernel32_test.exe/drive 80 tests executed,0 todo, 0 failures kernel32_test.exe/environ 19 executed, 0 todo, 0 failures kernel32_test.exe/file file.c:631: Test failed: WriteFile error 183 file.c:632: Test failed: expected number of bytes written 0 file.c:633:Current offset = 0100 file.c:634: Test failed: expected file offset 21 file.c:639: Test failed: WriteFile error 87 file.c:640: Test failed: expected number of bytes written 0 file.c:642: Test failed: expected file offset 517 file.c:656: Test failed: ReadFile error 0 file.c:657: Test failed: expected number of bytes read 0 file.c:658:Current offset = 0000 file.c:659: Test failed: expected file offset 21 file.c:661: Test failed: pattern match failed file: 487224 tests executed, 0 marked as todo, 10 failures. kernel32_test.exe/format_msg 58 executed, 0 todo, 0 failures kernel32_test.exe/generated 609 executed, 0 marked as todo, 0 failures kernel32_test.exe/locale locale.c:499: Test failed: GetDateFormat check DATE_YEARMONTH with null format e xpected ERROR_INVALID_FLAGS got return of '10' and error of '0' /locale: 105 tests executed, 0 marked as todo, 1 failure. kernel32_test.exe/path path.c:881:TMP=C:\WINDOWS\TEMP path.c:892:TMP=C:\WINDOWS path.c:902:TMP=C:\ path.c:912:TMP=C: 1702 executed, 0 todo, 0 failures kernel32_test.exe/process tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. tests/process.c: 1 tests executed, 0 marked as todo, 0 failures. 116 executed, 0 todo, 0 failures kernel32_test.exe/thread thread.c:430: Test failed: SetThreadPriorityBoost Failed thread.c:432: Test failed: GetThreadPriorityBoost Failed thread.c:434: Test failed: SetThreadPriorityBoost Failed thread.c:436: Test failed: GetThreadPriorityBoost Failed 86 executed, 0 todo, 4 failures msvcrt_test.exe/file 2 executed, 0 todo, 4 failures msvcrt_test.exe/scanf 8 tests executed, 0 todo, 0 failures netapi32_test.exe access.c:174:It appears there is no netapi32 functionality on this platform same error reported by all netapi32 tests. ntdll_test.exe/error 813 executed, 0 todo, 0 failures ntdll_test.exe/generated 1279 executed, 0 todo, 0 failures ntdll_test.exe/rtlbitmap, ntdll_test.exe/rtlst 1 executed, 0 todo, 0 failures

2 1

File locking ... need info
by Mike Robinson 01 Jan '03

01 Jan '03

[Please reply e-mail; I don't yet subscribe.] I am interested in support for file-locking and locking of specified regions of a file, in order to support databases such as MS-Access and Paradox. But as I ponder the various likely-looking segments of the source-code, I really do not know where to begin ... nor what has been done in this area before. It is clear that an implementation of locking must work on SMB-shares and that it should "actually lock things" in that other Windows users should see the locks as they are placed and removed. It's also clear that implementing timeouts on these locks could be "problematic," since the Unix impl. of file locking is not quite the same as Windows expects. Pointers? Comments? War-stories? Advice? "Someone already did that"s?

3 3

tests: ok(0,"foo") prints a '\n'!
by Francois Gouget 31 Dec '02

31 Dec '02

I noticed that the oleaut32/safearray test uses statements such as: ok(a->cDims == i,"a->cDims not initialised?\n"); But it is not necessary to add a '\n' to ok statements. All it does is insert an extra '\n' after each test error. I could send a patch to fix this (small) issue, but I think this behavior of 'ok' is wrong. It goes against the convention established by all other functions such as printf, TRACE, ERR and even the test framework's own trace function. None of these appends a '\n'. 'ok' is the exception there and safearray is not the first test (nor the last) to get caught by this. So if noone objects I'll send a patch that stops 'ok' from appending this '\n', and adds a '\n' to all calls to ok. Actually, I would be pretty happy if someone could come up with a perl script doing the latter... Comments? -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ 145 = 1! + 4! + 5!

3 3

Wine Packagers Guide
by Tom Wickline 31 Dec '02

31 Dec '02

I read over the Packagers Guide and here is a short list of things that I found that need looking into. I could use some help, input on this. --- 1.3. Terms used in this document FHS 2.1 specifications current version is 2.2 ---- 2.2. Requirements Wine will not run without a configuration file. Further, no default is currently provided by Wine. this has changed ? Wine does not completely support a complex multi-user installation ala Windows NT, but it could fairly readily. Does it now ? ---- 3.1. Wine Static and Shareable Files 2 Shared Object Library Files list 139 now there is 167 ? 3 Man Pages No winemaker man page listed 4 Include Files list 132 files is this list upto date ? 5 Documentation files. Need to make a list of Doc files. --- 5.1. OpenLinux Sample And why not a ditro independent Sample ? 1 Building the package this section needs updated Wine.ini ??? --- Chapter 6. Work to be done Needs work..... Tom

1 0

Re: PathCreateFromUrlW
by Dimitrie O. Paun 31 Dec '02

31 Dec '02

On December 31, 2002 02:06 pm, Matthew Mastracci wrote: > Sorry, here's the unified diff. Thanks! However, please generate the diff relative to wine's root, as I suggested: cvs diff -u dlls/shlwapi/path.c What you did is this: cd dlls/shlwapi; cvs diff -u path.c which just makes things harder for Alexandre when applying the patch. -- Dimi.

2 1

PathCreateFromUrlW
by Matthew Mastracci 31 Dec '02

31 Dec '02

Here's an implementation of PathCreateFromUrlW that helps Kazaa crash later rather than sooner. :) Can someone review this and check it in (if it doesn't require any fixes)? Index: path.c =================================================================== RCS file: /home/wine/wine/dlls/shlwapi/path.c,v retrieving revision 1.27 diff -r1.27 path.c 3157c3157,3159 < FIXME("(%s,%p,%p,0x%08lx)-stub\n", debugstr_w(lpszUrl), lpszPath, pcchPath, dwFlags); --- > static const WCHAR stemp[] = { 'f','i','l','e',':','/','/',0 }; > LPWSTR pwszPathPart; > TRACE("(%s,%p,%p,0x%08lx)\n", debugstr_w(lpszUrl), lpszPath, pcchPath, dwFlags); 3162c3164,3189 < return S_OK; --- > // Path of the form file://... > if (!strncmpW(lpszUrl, stemp, 7)) > { > lpszUrl += 7; > } > // Path of the form file:... > else if (!strncmpW(lpszUrl, stemp, 5)) > { > lpszUrl += 5; > } > > // Ensure that path is of the form c:... or c|... > if (lpszUrl[1] != ':' && lpszUrl[1] != '|' && isalphaW(*lpszUrl)) > return E_INVALIDARG; > > HRESULT hr = UrlUnescapeW(lpszUrl, lpszPath, pcchPath, dwFlags); > if (lpszPath[1] == '|') > lpszPath[1] = ':'; > > for (pwszPathPart = lpszPath; *pwszPathPart; pwszPathPart++) > if (*pwszPathPart == '/') > *pwszPathPart = '\\'; > > TRACE("Returning %s\n",debugstr_w(lpszPath)); > > return hr; -- Matthew Mastracci <matt(a)aclaro.com>

2 1