wine-devel July 2008

wine-devel@winehq.org

135 participants
411 discussions

Re: [3/3] gdiplus: Make GdipInvertMatrix test pass on native
by James Hawkins 12 Jul '08

12 Jul '08

On Sat, Jul 12, 2008 at 4:12 PM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > Changelog: > - Make GdipInvertMatrix test pass on native > > --- > dlls/gdiplus/tests/matrix.c | 23 +++++++++++++++++------ > 1 files changed, 17 insertions(+), 6 deletions(-) > > diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c > index 16c1517..daf61ea 100644 > --- a/dlls/gdiplus/tests/matrix.c > +++ b/dlls/gdiplus/tests/matrix.c > @@ -27,6 +27,19 @@ > > #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) > > +/* compare matrix data with some tolerance */ > +BOOL m_equalf(REAL *m1, REAL *m2) > +{ > + BOOL ret = TRUE; > + INT i; > + > + for(i = 0; i < 6; i++){ > + ret = ret && (fabsf(m1[i] - m2[i]) < 1e-5); > + } > + > + return ret; > +} > + > static void test_constructor_destructor(void) > { > GpStatus status; > @@ -119,12 +132,12 @@ static void test_isinvertible(void) > GdipDeleteMatrix(matrix); > } > > +static REAL minverted[] = {1.0/9.0, 2.0/9.0, 4.0/9.0, -1.0/9.0, -2.0, -1.0}; > static void test_invert(void) > { > GpStatus status; > GpMatrix *matrix = NULL; > - GpMatrix *inverted = NULL; > - BOOL equal; > + REAL mdata[6]; > > /* NULL */ > status = GdipInvertMatrix(NULL); > @@ -141,11 +154,9 @@ static void test_invert(void) > status = GdipInvertMatrix(matrix); > expect(Ok, status); > > - GdipCreateMatrix2(1.0/9.0, 2.0/9.0, 4.0/9.0, -1.0/9.0, -2.0, -1.0, &inverted); > - GdipIsMatrixEqual(matrix, inverted, &equal); > - expect(TRUE, equal); > + GdipGetMatrixElements(matrix, mdata); > + expect(TRUE, m_equalf(mdata, minverted)); > Why are you creating a new function that allows tolerance when you control the matrix you're comparing it to? Allowing slop is acceptable in some circumstances, but not in this case, when there is one exact value (or matrix of values) returned. -- James Hawkins

4 8

Re: [2/3] gdiplus: Fix test for PathIterator + make it pass on native and Wine (try2)
by James Hawkins 12 Jul '08

12 Jul '08

On Sat, Jul 12, 2008 at 4:11 PM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > Changelog: > - Fix test for PathIterator + make it pass on native and Wine > --- > dlls/gdiplus/pathiterator.c | 3 ++- > dlls/gdiplus/tests/pathiterator.c | 5 +++-- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c > index 55b0782..3d3b1dc 100644 > --- a/dlls/gdiplus/pathiterator.c > +++ b/dlls/gdiplus/pathiterator.c > @@ -140,7 +140,8 @@ GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator* iterator, INT *result > /* first call could start with second point as all subsequent, cause > path couldn't contain only one */ > for(i = iterator->marker_pos + 1; i < iterator->pathdata.Count; i++){ > - if(iterator->pathdata.Types[i] & PathPointTypePathMarker){ > + if((iterator->pathdata.Types[i] & PathPointTypePathMarker) || > + (i == iterator->pathdata.Count - 1)){ > *startIndex = iterator->marker_pos; > if(iterator->marker_pos > 0) (*startIndex)++; > *endIndex = iterator->marker_pos = i; > diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c > index 071c1d5..90725dc 100644 > --- a/dlls/gdiplus/tests/pathiterator.c > +++ b/dlls/gdiplus/tests/pathiterator.c > @@ -95,7 +95,8 @@ static void test_nextmarker(void) > GpPath *path; > GpPathIterator *iter; > GpStatus stat; > - INT start, end, result; > + INT start, end; > + INT result = (INT)0xdeadbeef; > > /* NULL args > BOOL out argument is local in wrapper class method, > @@ -114,7 +115,7 @@ static void test_nextmarker(void) > GdipCreatePathIter(&iter, path); > stat = GdipPathIterNextMarker(iter, &result, &start, &end); > expect(Ok, stat); > - expect(0, result); > + expect(TRUE, (result == 4) && (start == 0) && (end == 3)); Please break these out into their own tests. Like I said before, they are independent, and if one of them fails, it's impossible to tell from the test results which one is wrong. Also, none of the tests should be (returned == expected) == TRUE. It should simply be expect(expected, returned). -- James Hawkins

1 0

Re: winhttp: tests/winhttp.c[new]: Add test for WinHttpOpenRequest
by Zac Brown 12 Jul '08

12 Jul '08

Zac Brown wrote: > Add test for WinHttpOpenRequest. This test is modeled after > wininet/tests/http.c's InternetOpenRequest_test function. > > This is the first of many tests for getting Bug 14381 > (http://bugs.winehq.org/show_bug.cgi?id=14381) fixed with regard to > WinHTTP. > > > ------------------------------------------------------------------------ > > --- > Makefile.in | 2 + > configure | 3 + > dlls/Makefile.in | 1 + > dlls/winhttp/tests/Makefile.in | 13 +++++ > dlls/winhttp/tests/winhttp.c | 105 ++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 124 insertions(+), 0 deletions(-) > create mode 100644 dlls/winhttp/tests/Makefile.in > create mode 100644 dlls/winhttp/tests/winhttp.c > > diff --git a/Makefile.in b/Makefile.in > index 1b35079..6a56e44 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -495,6 +495,7 @@ ALL_MAKEFILES = \ > dlls/winex11.drv/Makefile \ > dlls/wing32/Makefile \ > dlls/winhttp/Makefile \ > + dlls/winhttp/tests/Makefile \ > dlls/wininet/Makefile \ > dlls/wininet/tests/Makefile \ > dlls/winmm/Makefile \ > @@ -924,6 +925,7 @@ dlls/winequartz.drv/Makefile: dlls/winequartz.drv/Makefile.in dlls/Makedll.rules > dlls/winex11.drv/Makefile: dlls/winex11.drv/Makefile.in dlls/Makedll.rules > dlls/wing32/Makefile: dlls/wing32/Makefile.in dlls/Makedll.rules > dlls/winhttp/Makefile: dlls/winhttp/Makefile.in dlls/Makedll.rules > +dlls/winhttp/tests/Makefile: dlls/winhttp/tests/Makefile.in dlls/Maketest.rules > dlls/wininet/Makefile: dlls/wininet/Makefile.in dlls/Makedll.rules > dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules > dlls/winmm/Makefile: dlls/winmm/Makefile.in dlls/Makedll.rules > diff --git a/configure b/configure > index d9f9b65..a276261 100755 > --- a/configure > +++ b/configure > @@ -22416,6 +22416,8 @@ ac_config_files="$ac_config_files dlls/wing32/Makefile" > > ac_config_files="$ac_config_files dlls/winhttp/Makefile" > > +ac_config_files="$ac_config_files dlls/winhttp/tests/Makefile" > + > ac_config_files="$ac_config_files dlls/wininet/Makefile" > > ac_config_files="$ac_config_files dlls/wininet/tests/Makefile" > @@ -23481,6 +23483,7 @@ do > "dlls/winex11.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winex11.drv/Makefile" ;; > "dlls/wing32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wing32/Makefile" ;; > "dlls/winhttp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winhttp/Makefile" ;; > + "dlls/winhttp/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winhttp/tests/Makefile" ;; > "dlls/wininet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/Makefile" ;; > "dlls/wininet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/tests/Makefile" ;; > "dlls/winmm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;; > diff --git a/dlls/Makefile.in b/dlls/Makefile.in > index d130f35..1a77dc0 100644 > --- a/dlls/Makefile.in > +++ b/dlls/Makefile.in > @@ -362,6 +362,7 @@ TESTSUBDIRS = \ > usp10/tests \ > uxtheme/tests \ > version/tests \ > + winhttp/tests \ > wininet/tests \ > winmm/tests \ > winspool.drv/tests \ > diff --git a/dlls/winhttp/tests/Makefile.in b/dlls/winhttp/tests/Makefile.in > new file mode 100644 > index 0000000..3f35e08 > --- /dev/null > +++ b/dlls/winhttp/tests/Makefile.in > @@ -0,0 +1,13 @@ > +TOPSRCDIR = @top_srcdir@ > +TOPOBJDIR = ../../.. > +SRCDIR = @srcdir@ > +VPATH = @srcdir@ > +TESTDLL = winhttp.dll > +IMPORTS = winhttp ws2_32 kernel32 > + > +CTESTS = \ > + winhttp.c > + > +@MAKE_TEST_RULES@ > + > +@DEPENDENCIES@ # everything below this line is overwritten by make depend > diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c > new file mode 100644 > index 0000000..afc9d97 > --- /dev/null > +++ b/dlls/winhttp/tests/winhttp.c > @@ -0,0 +1,105 @@ > +/* > + * WinHTTP - tests > + * > + * Copyright 2008 Google (Zac Brown) > + * > + * 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., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301, USA > + */ > + > +#define COBJMACROS > + > +#include <stdarg.h> > +#include <stdio.h> > +#include <stdlib.h> > + > +#include <windef.h> > +#include <winbase.h> > +#include <winhttp.h> > + > +#include "wine/test.h" > + > +/* Function pointer declarations for functions being used */ > +static HINTERNET (WINAPI *pWinHttpOpen) (LPCWSTR pwszUserAgent, DWORD dwAccessType, > + LPCWSTR pwszProxyName, LPCWSTR pwszProxyBypass, DWORD dwFlags); > +static HINTERNET (WINAPI *pWinHttpConnect) (HINTERNET hSession, LPCWSTR pwszServerName, > + INTERNET_PORT nServerPort, DWORD dwReserved); > +static HINTERNET (WINAPI *pWinHttpOpenRequest) (HINTERNET hConnect, LPCWSTR pwszVerb, > + LPCWSTR pwszObjectName, LPCWSTR pwszVersion, LPCWSTR pwszReferrer, > + LPCWSTR* ppwszAcceptTypes, DWORD dwFlags); > +static BOOL (WINAPI *pWinHttpSendRequest) (HINTERNET hRequest, LPCWSTR pwszHeaders, > + DWORD dwHeadersLength, LPVOID lpOptional, DWORD dwOptionalLength, > + DWORD dwTotalLength, DWORD_PTR dwContext); > +static BOOL (WINAPI *pWinHttpCloseHandle) (HINTERNET hInternet); > + > +static const WCHAR test_useragent[] = {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; > +static const WCHAR test_server[] = {'w','i','n','e','h','q','.','o','r','g',0}; > + > +/* BEGIN TESTS */ > + > +static void test_OpenRequest (void) > +{ > + BOOL ret; > + HINTERNET session, request, connection; > + session = request = connection = NULL; > + > + session = pWinHttpOpen (test_useragent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); > + todo_wine ok (session != NULL, "WinHttpOpen failed to open session.\n"); > + > + /* Test with a bad server name */ > + SetLastError (0xdeadbeef); > + connection = pWinHttpConnect (session, NULL, INTERNET_DEFAULT_HTTP_PORT, 0); > + ok (connection == NULL, "WinHttpConnect succeeded in opening connection to NULL server argument.\n"); > + todo_wine ok (GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); > + > + /* Test with a valid server name */ > + connection = pWinHttpConnect (session, test_server, INTERNET_DEFAULT_HTTP_PORT, 0); > + todo_wine ok (connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); > + > + request = pWinHttpOpenRequest (connection, NULL, NULL, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0); > + if (request == NULL && GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED) > + { > + skip("Network unreachable, skipping.\n"); > + goto done; > + } > + todo_wine ok (request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); > + > + ret = pWinHttpSendRequest (request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0); > + todo_wine > + { > + ok (ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); > + ok (WinHttpCloseHandle (request), "WinHttpCloseHandle failed on closing request.\n"); > + } > + > + done: > + todo_wine > + { > + ok (WinHttpCloseHandle (connection), "WinHttpCloseHandle failed on closing connection.\n"); > + ok (WinHttpCloseHandle (session), "WinHttpCloseHandle failed on closing session.\n"); > + } > +} > + > +START_TEST (winhttp) > +{ > + HMODULE hmod = LoadLibraryA ("winhttp.dll"); > + > + pWinHttpOpen = (void *) GetProcAddress (hmod, "WinHttpOpen"); > + pWinHttpConnect = (void *) GetProcAddress (hmod, "WinHttpConnect"); > + pWinHttpOpenRequest = (void *) GetProcAddress (hmod, "WinHttpOpenRequest"); > + pWinHttpSendRequest = (void *) GetProcAddress (hmod, "WinHttpSendRequest"); > + pWinHttpCloseHandle = (void *) GetProcAddress (hmod, "WinHttpCloseHandle"); > + > + test_OpenRequest(); > +} > > > ------------------------------------------------------------------------ > > As a note this passes on Win XP as well as Win 2003.

2 1

Installing Wine's fonts system-wide: which ones are worthwhile?
by Scott Ritchie 12 Jul '08

12 Jul '08

After being partially inspired by Ubuntu brainstorm, it occurred to me that some of our fonts would be useful everywhere, but the current Wine package keeps its fonts to itself. Tahoma, for instance, could be useful if someone tries to open a Word document in Open Office. The solution varies across distributions, however in Ubuntu and Debian's case it means naming the fonts specifically and creating a hints file. So, which ones should be installed this way? Thanks, Scott Ritchie

3 3

Question about crosstest build
by Nikolay Sivov 12 Jul '08

12 Jul '08

Hi. Could someone explain me in details how could I build crosstest binaries on Linux (Debian) to run them on WinXP? Now I've done the following: - clean up my wine tree with 'make clean'; - installed mingw32 package - use configure parameters from http://wiki.winehq.org/CompilingDLLsUsingMingw - use 'make crosstest' from tree top. After building wine tools I've got: make[1]: Entering directory `/home/mrlarch/wine/dlls' make[2]: Entering directory `/home/mrlarch/wine/dlls/d3dx9_36' ../../tools/winebuild/winebuild -w --def -o d3dx9_36.def --export ./d3dx9_36.spec false -k -l libd3dx9.a -d d3dx9_36.def make[2]: *** [libd3dx9.a] Error 1 make[2]: Leaving directory `/home/mrlarch/wine/dlls/d3dx9_36' make[1]: *** [d3dx9_36/libd3dx9.a] Error 2 make[1]: Leaving directory `/home/mrlarch/wine/dlls' make: *** [dlls/__crosstest__] Error 2 What should I do with that?

2 2

Re: failing gdiplus:matrix tests
by James Hawkins 12 Jul '08

12 Jul '08

On Sat, Jul 12, 2008 at 1:58 AM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > James Hawkins wrote: >> >> Hi Nikolay, >> >> Tests you added in the following commit fail on all platforms. Did >> you run the tests in Windows? >> >> commit d7999a008be5d7e95fcd86019adc79b0359ae8d4 >> Author: Nikolay Sivov <bunglehead(a)gmail.com> >> Date: Tue Jul 8 01:32:36 2008 +0400 >> >> gdiplus: GdipInvertMatrix implementation with tests. >> > > No, I never tried to run the test binary on Windows. I always try get test > results > trough my own test application and use these results in Wine test. > Of course I will fix this, could you explain how to build tests on Windows? > I never did such thing. > http://wiki.winehq.org/CompilingDLLsUsingMingw 'make crosstest' works if you have a patched mingw. You can get the patches at: http://www.astro.gla.ac.uk/users/paulm/Cross/ If you end up not being able to build the tests, ask someone on wine-devel to build them for you. -- James Hawkins

3 5

[winehq] broken link
by Stefan Leichter 12 Jul '08

12 Jul '08

Hi, when i click on the "Development" link in the "Development" section i get an 404 error. Can someone please fix this. Thanks Stefan

2 1

Re: failing gdiplus:matrix tests
by James Hawkins 12 Jul '08

12 Jul '08

1 0

Re: riched20: Added windowless text services tests (resent)
by Austin Lund 12 Jul '08

12 Jul '08

I haven't heard anything about this patch. I know it is large, but the function headers and wrappers are necessary. Is there anything in particular wrong with it? Is there anything that could make it more obviously correct? 2008/7/7 Austin Lund <austin.lund(a)gmail.com>: > Changes from previously sent patch: > > Removed typeof() from DEFINE_THISCALL_WRAPPER. > Simplified the ITextHost QueryInterface function. > Removed code that allocated memory for the IUnknown interface. >

1 0

failing gdiplus:pathiterator tests
by James Hawkins 12 Jul '08

12 Jul '08

Hi Nikolay, Tests you added in the following two commits fail on all platforms. Did you run the tests in Windows? Please do not send any more test patches before testing on Windows first. commit d93ad02216d28851b2be07d8ee89671a7354761f Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 3 10:42:13 2008 +0400 gdiplus: Construction/desctruction tests for PathIterator. commit 0a9937c534823df161f0b911dd410a508ea4a148 Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jul 5 13:02:36 2008 +0400 gdiplus: GdipPathIterNextMarker implementation with tests. -- James Hawkins

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
42
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-devel July 2008