February 2008 - Wine-Devel - list.winehq.org

Re: wininet: Fix retrieving the raw headers

by Alexandre Julliard

"Maarten Lankhorst" <m.b.lankhorst(a)gmail.com> writes: > @@ -3059,12 +3060,14 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr) > * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. > */ > memset(buffer, 0, MAX_REPLY_LEN); > + memset(buffertoken, 0, MAX_REPLY_LEN); > if (!NETCON_getNextLine(&lpwhr->netConnection, bufferA, &buflen)) > goto lend; > MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); > + MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffertoken, MAX_REPLY_LEN ); That's ugly, it shouldn't be necessary to have two copies of the whole data just to parse some status codes. -- Alexandre Julliard julliard(a)winehq.org

Feb. 26, 2008

Re: msvcrt: Implemented wcscpy_s (try 2)

by Alistair Leslie-Hughes

Hi, Is there any thing wrong with this patch? Best Regards Alistair Leslie-Hughes "Alistair Leslie-Hughes" <leslie_alistair(a)hotmail.com> wrote in message news:fpljui$nsa$1(a)ger.gmane.org... > Hi, > Correct msvcrt.spec file > > Changelog: > msvcrt: Implemented wcscpy_s > -------------------------------------------------------------------------------- > From 6860771cc3fc06b3da63f7c674daf71861593ef3 Mon Sep 17 00:00:00 2001 > From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > Date: Fri, 22 Feb 2008 13:48:01 +1100 > Subject: [PATCH] Implemented wcscpy_s > > --- > dlls/msvcrt/msvcrt.spec | 1 + > dlls/msvcrt/tests/string.c | 45 > ++++++++++++++++++++++++++++++++++++++++++++ > dlls/msvcrt/wcs.c | 45 > ++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 91 insertions(+), 0 deletions(-) > > diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec > index d6cffcb..7b821e6 100644 > --- a/dlls/msvcrt/msvcrt.spec > +++ b/dlls/msvcrt/msvcrt.spec > @@ -761,6 +761,7 @@ > @ cdecl wcscmp(wstr wstr) ntdll.wcscmp > @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll > @ cdecl wcscpy(ptr wstr) ntdll.wcscpy > +@ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s > @ cdecl wcscspn(wstr wstr) ntdll.wcscspn > @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime > @ cdecl wcslen(wstr) ntdll.wcslen > diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c > index c6dcd34..b09d204 100644 > --- a/dlls/msvcrt/tests/string.c > +++ b/dlls/msvcrt/tests/string.c > @@ -50,6 +50,7 @@ static int* (*pmemcmp)(void *, const void *, size_t n); > static int (*pstrcpy_s)(char *dst, size_t len, const char *src); > static int (*pstrcat_s)(char *dst, size_t len, const char *src); > static int (*p_mbsnbcpy_s)(unsigned char * dst, size_t size, const > unsigned char * src, size_t count); > +static int (*p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t > *wcSrc); > > #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) > #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", > y) > @@ -562,6 +563,47 @@ static void test__mbsnbcpy_s(void) > dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], > dest[7]); > } > > +static void test_wcscpy_s(void) > +{ > + static const WCHAR szLongText[] = { > 'T','h','i','s','A','L','o','n','g','s','t','r','i','n','g',0 }; > + static WCHAR szDest[18]; > + static WCHAR szDestShort[8]; > + int ret; > + > + if(!p_wcscpy_s) > + { > + skip("wcscpy_s not found\n"); > + return; > + } > + > + /* Test NULL Dest */ > + ret = p_wcscpy_s(NULL, 16, szLongText); > + ok(ret == EINVAL, "p_wcscpy_s expect EINVAL got %d\n", ret); > + > + /* Test NULL Source */ > + szDest[0] = 'A'; > + ret = p_wcscpy_s(szDest, 16, NULL); > + ok(ret == EINVAL, "expected EINVAL got %d\n", ret); > + ok(szDest[0] == 0, "szDest[0] not 0\n"); > + > + /* Test invalid size */ > + szDest[0] = 'A'; > + ret = p_wcscpy_s(szDest, 0, szLongText); > + ok(ret == EINVAL, "expected ERANGE got %d\n", ret); > + ok(szDest[0] == 0, "szDest[0] not 0\n"); > + > + /* Copy same buffer size */ > + ret = p_wcscpy_s(szDest, 18, szLongText); > + ok(ret == 0, "expected 0 got %d\n", ret); > + ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); > + > + /* Copy smaller buffer size */ > + szDest[0] = 'A'; > + ret = p_wcscpy_s(szDestShort, 8, szLongText); > + ok(ret == ERANGE, "expected EINVAL got %d\n", ret); > + ok(szDestShort[0] == 0, "szDest[0] not 0\n"); > +} > + > START_TEST(string) > { > char mem[100]; > @@ -577,6 +619,7 @@ START_TEST(string) > SET(pstrcpy_s,"strcpy_s"); > SET(pstrcat_s,"strcat_s"); > SET(p_mbsnbcpy_s,"_mbsnbcpy_s"); > + SET(p_wcscpy_s,"wcscpy_s"); > > /* MSVCRT memcpy behaves like memmove for overlapping moves, > MFC42 CString::Insert seems to rely on that behaviour */ > @@ -599,4 +642,6 @@ START_TEST(string) > test_strcpy_s(); > test_strcat_s(); > test__mbsnbcpy_s(); > + > + test_wcscpy_s(); > } > diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c > index 92dd644..66b8907 100644 > --- a/dlls/msvcrt/wcs.c > +++ b/dlls/msvcrt/wcs.c > @@ -27,6 +27,8 @@ > #include "wine/unicode.h" > #include "wine/debug.h" > > +#include <msvcrt/errno.h> > + > WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); > > > @@ -971,3 +973,46 @@ INT CDECL MSVCRT_iswxdigit( MSVCRT_wchar_t wc ) > { > return isxdigitW( wc ); > } > + > +/********************************************************************* > + * wcscpy_s (MSVCRT.@) > + */ > +INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, size_t numElement, > const MSVCRT_wchar_t *wcSrc) > +{ > + int size = 0; > + > + if(!wcDest) > + return EINVAL; > + > + if(!wcSrc) > + { > + wcDest[0] = 0; > + return EINVAL; > + } > + > + if(numElement <= 0) > + { > + wcDest[0] = 0; > + > + if(numElement < 0) > + return ERANGE; > + else > + return EINVAL; > + } > + > + size = strlenW(wcSrc) + 1; > + > + if(size > numElement) > + { > + wcDest[0] = 0; > + return ERANGE; > + } > + > + if(size > numElement) > + size = numElement; > + > + memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); > + > + return 0; > +} > + > -- > 1.5.4.1 > > -------------------------------------------------------------------------------- > >

Feb. 26, 2008

Re: [6/6] msxml3: Tests for put_data

by Alistair Leslie-Hughes

"Alistair Leslie-Hughes" <leslie_alistair(a)hotmail.com> wrote in message news:fpu31c$upv$4(a)ger.gmane.org... > +#if 0 > +/* For some Reason, IXMLDOMComment_put_data cannot be found even though > it can > + be exists in msxml2.h. > + */ > + /* put data Tests */ > + hr = IXMLDOMComment_put_data(pComment, _bstr_("This &is a > ; test <>\\")); > + ok(hr == S_OK, "ret %08x\n", hr ); > + > +#endif Hi, Im a little confused, IXMLDOMComment_put_data wasnt compiling on my machine, and yet Alexandre changed to include this code and now it compiles correctly? I event tried a >make clean; ./configure; make depend;make which didnt work either. Can anybody explain what was fixed? Best Regards Alistair Leslie-Hughes

Feb. 26, 2008

marshalled ITypeComp

by Guillermo Winkler

Hi, I'm having some problems regarding ITypeInfo/ITypeComp implementation. IDispatch* pdisp; ITypeInfo* ptinfo; HRESULT hr = pdisp->GetTypeInfo(0, LOCALE_SYSTEM_DEFAULT, &typeinfo); hr = ptinfo->GetTypeComp(&ptcomp); pdisp is created from hr = CoCreateInstance(clsid, NULL, CLSCTX_SERVER, IID_IDispatch, (void**)&pdisp); That is, the server is an outprocess exe. In this case marshalling of ITypeComp fails in first instance because ITypeComp_fnQueryInterface (oleaut32\typelib.c) resolves on -> ITypeInfo_QueryInterface (oleaut32\typelib.c) That is not considering IID_ITypeComp as a valid alternative(but it is) if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid,&IID_ITypeInfo)|| IsEqualIID(riid,&IID_ITypeInfo2)) *ppvObject = This; When I fixed this, I have a different problem now: fixme:ole:DllGetClassObject CLSID: {00020425-0000-0000-C000-000000000046} IID: {D5F569D0-593B-101A-B569-08002B2DBF7A} That is PSTypeComp to be marshalled asking for factory buffer IID_IPSFactoryBuffer. I would like to follow up with someone (if available) just to be sure I'm not wasting time on the wrong track. Thanks, Guillermo

Feb. 26, 2008

Re: Valgrind results. Update for glibc-2.6.

by James Hawkins

On Mon, Feb 25, 2008 at 11:55 PM, Dan Kegel <dank06(a)kegel.com> wrote: > On Mon, Feb 25, 2008 at 10:29 AM, James Hawkins <truiken(a)gmail.com> wrote: > > Can you update the wiki page with instructions on running the entire > > Wine/Valgrind test system? > > Done. http://wiki.winehq.org/Wine_and_Valgrind is simpler and more up to date. > > > > I'm on gutsy, so do I ignore your > > valgrind-build.sh and get valgrind svn and apply the above patch? > > Yeah. Or use the updated script, > http://kegel.com/wine/valgrind/valgrind-svn-build.sh.txt > Thanks a lot Dan! Now we can all use valgrind when working on Wine ;) -- James Hawkins

Feb. 25, 2008

Re: Valgrind results. Update for glibc-2.6.

by Dan Kegel

On Mon, Feb 25, 2008 at 10:29 AM, James Hawkins <truiken(a)gmail.com> wrote: > Can you update the wiki page with instructions on running the entire > Wine/Valgrind test system? Done. http://wiki.winehq.org/Wine_and_Valgrind is simpler and more up to date. > I'm on gutsy, so do I ignore your > valgrind-build.sh and get valgrind svn and apply the above patch? Yeah. Or use the updated script, http://kegel.com/wine/valgrind/valgrind-svn-build.sh.txt - Dan

Feb. 25, 2008

Re: GSoC project ideas

by Kai Blin

On Monday 25 February 2008 09:24:10 Kai Blin wrote: > > Feel free to add your own project ideas, maybe elaborate a bit on the > deliverables of the idea. Marcus Meissner added * DirectInput : Implemented DirectInput8 specific features: ActionMapping and Enumeration by Semantics to the wiki page. Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

Feb. 25, 2008

Re: Add a slight delay before testing the ddraw and d3d9 visual tests

by Dmitry Timoshkov

"Maarten Lankhorst" <m.b.lankhorst(a)gmail.com> wrote: >> Perhaps there is something less hacky way like GdiFlush() which is more >> appropriate for this. > I created a patch that does GdiFlush and waits up to .5 seconds after > a resolution change, are you ok with that? Perhaps you could investigate first what's the cause that you need to add that delay on your system, and others don't? -- Dmitry.

Feb. 25, 2008

Re: d3dx9_xx

by Francois Gouget

On Fri, 22 Feb 2008, "Luis C. Busquets Pérez" wrote: > The number of functions reported in > http://www.winehq.org/site/winapi_stats > for the following dlls is > > d3dx9_24 308 [...] That's because d3dx9_36 has some forwards to functions that have not been declared in d3dx8, not even as a stub. It's allowed of course but winapi does not like it and thus ignores those. Here's the list: d3dx9_36.spec: forward is broken: D3DXFresnelTerm => d3dx8.D3DXFresnelTerm d3dx9_36.spec: forward is broken: D3DXGetImageInfoFromFileA => d3dx8.D3DXGetImageInfoFromFileA d3dx9_36.spec: forward is broken: D3DXGetImageInfoFromFileInMemory => d3dx8.D3DXGetImageInfoFromFileInMemory d3dx9_36.spec: forward is broken: D3DXGetImageInfoFromFileW => d3dx8.D3DXGetImageInfoFromFileW d3dx9_36.spec: forward is broken: D3DXGetImageInfoFromResourceA => d3dx8.D3DXGetImageInfoFromResourceA d3dx9_36.spec: forward is broken: D3DXGetImageInfoFromResourceW => d3dx8.D3DXGetImageInfoFromResourceW d3dx9_36.spec: forward is broken: D3DXIntersectSubset => d3dx8.D3DXIntersectSubset d3dx9_36.spec: forward is broken: D3DXIntersectTri => d3dx8.D3DXIntersectTri d3dx9_36.spec: forward is broken: D3DXQuaternionSquadSetup => d3dx8.D3DXQuaternionSquadSetup d3dx9_36.spec: forward is broken: D3DXSplitMesh => d3dx8.D3DXSplitMesh d3dx9_36.spec: forward is broken: D3DXTessellateNPatches => d3dx8.D3DXTessellateNPatches -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ You can have my guns when you pry them from my kids cold, dead hands.

Feb. 25, 2008

Re: Add a slight delay before testing the ddraw and d3d9 visual tests

by Maarten Lankhorst

2008/2/13, Dmitry Timoshkov <dmitry(a)codeweavers.com>: > "Maarten Lankhorst" <m.b.lankhorst(a)gmail.com> wrote: > > > This makes the tests pass on my pc. > > Perhaps there is something less hacky way like GdiFlush() which is more > appropriate for this. I created a patch that does GdiFlush and waits up to .5 seconds after a resolution change, are you ok with that? Cheers, Maarten.

Feb. 25, 2008