wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

Re: Native NetBSD audio driver
by Yorick Hardy 03 Mar '04

03 Mar '04

I started now with the integration of the OSS and NetBSD audio drivers. Before I get too far, I would like to hear suggestions/criticisms. 1) I created the directory dlls/winmm/drvcommon (perhaps there is a better name ?) 2) moved dlls/winmm/wineoss/oss.c and dlls/winmm/winenbsd/nbsd.c to the single integrated file dlls/winmm/drvcommon/drv.c. 3) renamed the files dlls/winmm/wineoss/oss.h and dlls/winmm/winenbsd/nbsd.h to dlls/winmm/wineoss/drv.h and dlls/winmm/winenbsd/drv.h respectively. 4) Update the respective Makefile.in to use the integrated dlls/winmm/drvcommon/drv.c The idea is that eventually winenbsd and wineoss only have the drv.h and the spec file. drv.h will define all driver specific names/functions. I must stress that I am only concerned with the OSS and NetBSD drivers at the moment. Is this too much? Or can someone suggest a better solution? Kind regards, -- Yorick Hardy Tel: +2711 489 3640 | Fax: +2711 489 2067 | Office: C-Ring 517 Auckland Park Campus | Rand Afrikaans University | South Africa Department of Applied Mathematics : http://general.rau.ac.za/apm Standard Bank Academy for Information Technology : http://csweb.rau.ac.za

3 3

Re: SysParametersInfoW->A crosscall (fixed)
by tony_lambregts＠telusplanet.net 03 Mar '04

03 Mar '04

Alexandre, is there any reason that this patch isn't applied? http://www.winehq.org/hypermail/wine-patches/2004/02/0332.html -- Tony Lambregts

2 1

Re: winemaker fixes
by Dimitrie O. Paun 02 Mar '04

02 Mar '04

On Tue, 2 Mar 2004, Francois Gouget wrote: > winemaker is pretty broken since it has been patched to call winegcc. I > suspect it was not tested. Hey, I can't do everything! :))) I just wanted to get the ball rolling. > We must specify '-lmsvcrt' if using the msvcrt. Please don't, it's not needed. If you want to use msvcrt, please pass the -mno-cygwin switch. if that doesn' work, it's a bug in winegcc. > There is still work to do: > > 1. Linking with uuid is broken. I suspect winegcc finds the Unix > /lib/libuuid.so first and links with that instead of with our libuuid.a > library. That shouldn't happen. Can you please run winegcc with the -v flag, and send the output my way please? > 2. wrc does not find 'windows.h' (yes, some RC files #include Win32 > headers). wrc should know about the location of the headers like winegcc > (since our Makefile don't know anything about where the Wine headers are > anymore). I've verified the source and it should. Maybe you can produce a --debug=FF trace? > 4. We have lost the autoconf integration. We should encapsulate our macros so they can conveniently be used by people in their configure.ac scripts. I think that's the proper way to get autoconf integration. > 5. Nothing works if Wine has not been installed. This is quite > impractical for Wine developers. It's true, but there are many reasons you need to install Wine to be able to use Winelib. I doubt it will change in the near future. > 6. winegcc is not rebuilt if the '--prefix' changes. Maybe AJ can fix the Makefile. I think winegcc.o should depend on the Makefile. > 7. Building dlls does not work yet but that was expected and Dimi is > working on it. In progress :) -- Dimi.

3 2

Re: Native NetBSD audio driver
by Eric Pouech 02 Mar '04

02 Mar '04

Yorick Hardy a écrit : > This patch adds the audio driver winenbsd using the native NetBSD > audio system as an alternative to OSS. On the one hand > this is useful to directly make use of the features of the NetBSD > audio system instead of using emulation, on the other hand > it is another driver to maintain and is quite close to the wineoss driver. > If the driver is accepted, I think the NetBSD support for wineoss > should remain for testing and for the main driver. I really think we're starting to create a real mess for the audio drivers. It's always useful to have drivers access the HW at the lowest level, so we should support NetBSD. However, if the iface is rather close to OSS, I'd rather suggest we try to integrate all the drivers with the same features into a single piece of driver > diff -urN /home/yorick/software/wine/wine/dlls/Makefile.in ./dlls/Makefile.in > --- /home/yorick/software/wine/wine/dlls/Makefile.in Sat Feb 14 19:20:00 2004 > +++ ./dlls/Makefile.in Sat Feb 21 23:43:35 2004 > @@ -1745,6 +1749,7 @@ > winmm/winejack/winejack.drv$(DLLEXT): winmm/winejack > msacm/winemp3/winemp3.acm$(DLLEXT): msacm/winemp3 > winmm/winenas/winenas.drv$(DLLEXT): winmm/winenas > +winmm/winenas/winenbsd.drv$(DLLEXT): winmm/winenbsd *** this should be winenbsd A+

7 8

Cross compiling Wine with MinGW
by Hans Leidekker 02 Mar '04

02 Mar '04

Hi, I spent some time cross compiling all of Wine with MinGW according to this recipe: http://winehq.com/?issue=123#Cross-compiling Wine and I thought you might be interested in the results. I can report a bug in Wine's makefiles right away: having those vxd's in subdirectories that end in .vxd causes make to barf on targets like this one: ifsmgr.vxd$(DLLEXT): ifsmgr.vxd/ifsmgr.vxd$(DLLEXT) $(RM) $@ && $(LN_S) ifsmgr.vxd/ifsmgr.vxd$(DLLEXT) $@ because, if $(DLLEXT) is empty, it will try to create a link with a name that's already there as a directory. Of all dlls these don't compile: x11drv kernel32 gdi32 ws2_32 comctl32 icmp iphlapi msvcrt ntdll rpcrt4 shlwapi vnb.vxd wininet wsock32 x11drv, kernel32, gdi32 and ntdll being predictable, because they build directly on X11 and Unix API's. Same goes for the networking related dlls (ws2_32, icmp and iphlpapi, vnb.vxd, wininet, wsock32). msvcrt is close to building because what I saw was mostly header clashes, which could be fixed with proper guards I think. rpcrt4 fails because it uses one Unix API, gettimeofday, and both comctl32 and shlwapi suffer from the bug in dlltool that Dmitry reported and fixed recently. -Hans

3 3

Re: Re: Native NetBSD audio driver
by chmorgan＠charter.net 02 Mar '04

02 Mar '04

What is the plan for combining these audio drivers? One thing that is common to each driver are the functions that handle the wave headers, adding, removing etc. I'm also weary of any kind of combination that includes OSS as OSS is depreciated and has been replaced by Alsa. I'm also concerned with the arts, jack and nas drivers being left out of this merge. While many of the audio drivers have a lot in common there are a LOT of subtle differences that are necessary for things to work correctly. Maybe Eric and others could comment on what they see as being able to be combined, although I've worked a bit on audio drivers I'm drawing mostly a blank. Thanks, Chris > > From: Yorick Hardy <yha(a)na.rau.ac.za> > Date: 2004/03/02 Tue AM 04:38:41 EST > To: wine-devel(a)winehq.org > CC: yha(a)na.rau.ac.za > Subject: Re: Native NetBSD audio driver > > I started now with the integration of the OSS and NetBSD audio drivers. > Before I get too far, I would like to hear suggestions/criticisms. > > 1) I created the directory dlls/winmm/drvcommon > (perhaps there is a better name ?) > 2) moved dlls/winmm/wineoss/oss.c and dlls/winmm/winenbsd/nbsd.c > to the single integrated file dlls/winmm/drvcommon/drv.c. > 3) renamed the files dlls/winmm/wineoss/oss.h and dlls/winmm/winenbsd/nbsd.h > to dlls/winmm/wineoss/drv.h and dlls/winmm/winenbsd/drv.h respectively. > 4) Update the respective Makefile.in to use the integrated > dlls/winmm/drvcommon/drv.c > > The idea is that eventually winenbsd and wineoss only have the drv.h > and the spec file. drv.h will define all driver specific names/functions. > I must stress that I am only concerned with the OSS and NetBSD drivers > at the moment. > > Is this too much? Or can someone suggest a better solution? > > Kind regards, > > -- > Yorick Hardy > Tel: +2711 489 3640 | Fax: +2711 489 2067 | Office: C-Ring 517 > Auckland Park Campus | Rand Afrikaans University | South Africa > Department of Applied Mathematics : http://general.rau.ac.za/apm > Standard Bank Academy for Information Technology : http://csweb.rau.ac.za > > >

1 0

Re: winegcc: portability
by Kirill Smelkov 02 Mar '04

02 Mar '04

1 Март 2004 05:52, Dimitrie O. Paun написал: > OK, this is it. I've included the new config.h.in for > patch review convenience. Please run > > autoheader > autoconf > > after applying it. With this stuff in the tree, we should > be able to build programs/* with it. Next on the list is > -shared support... > > ChangeLog > Instrument winegcc to use the compilers and options detected > at configure time. Add support for parsing/formatting a string > array from/to a char string. Add option to disable short wchar > support in winegcc. And what about next (removed from winemaker by your recent patch) -fpermissive, -fms-extensions -fno-for-scope ? They are very handy when porting win32 apps. -- Kirill.

2 3

Re: Cross compiling Wine with MinGW
by Hans Leidekker 02 Mar '04

02 Mar '04

On Sunday 29 February 2004 20:49, Juan Lang wrote: > > Shouldn't wininet build on ws2_32 and thus compile? > > I think it should be investigated... > > wininet currently depends on OpenSSL and BSD (unix) > sockets. I think the way OpenSSL is being used makes > it rather hard to use ws2_32 instead, but if someone > wants to take that on that would help. I'm trying to > implement SSL in secur32.dll so wininet can use this, > but it will take me a while (it's rather large). > Helpers welcome :) > > I can fix up vnb.vxd, it really should build on MinGW, > whether or not it's useful to do so. I'll send a > patch shortly. If I include winsock2.h, get rid of the sys/socket.h, netinet/in.h and arpa/inet.h includes and additionally link to ws2_32 it builds on MinGW as well as Wine. > Hans, why didn't wsock32 build? It looks like > configure should protect you against missing headers > and whatnot; it mostly forwards to iphlpapi and > ws2_32. It's missing some constants: ../../../wine/dlls/wsock32/protocol.c:144: `SOCK_STREAM' undeclared (first use in this function) ../../../wine/dlls/wsock32/protocol.c:155: `SOCK_DGRAM' undeclared (first use in this function) These are in winsock.h but protocol.c only includes winsock2.h When I change the include to winsock.h I get: ../../../wine/include/winsock.h:25:4: #error Please use Winsock2 in Wine winsock2.h says: FIXME: Still missing required Winsock 2 definitions. MinGW and MSVC versions of winsock2.h have the defines, so I guess we need to add them. Attached patch does so. -Hans Changelog: add protocol type constants.

2 2

Problems with CHtmlView class in WINE
by vishal wable 02 Mar '04

02 Mar '04

Respected Sir, I am trying to run a MFC application in Red Hat Linux 8 using WINE.(Latest Version). I have used a MFC class "CHtmlView" in order to display html pages. Following line of code does that for me. Navigate2( "MyPage.html",NULL,NULL); In WINE i get the following error when trying to do so. "Cannot create an empty document" and the application crashes. Could you please help me to solve this problem. thank you, Regards, Vishal Wable --------------------------------- Do you Yahoo!? Get better spam protection with Yahoo! Mail

2 1

Close button on MFC dockable windows
by Justin Chevrier 02 Mar '04

02 Mar '04

Several programs: eg: Powergrab: http://www.cosmicwolf.com SCB Demo3: http://adam.stup.ac.ru/Developer/ ArticleDetail.aspx?ar=318&l=n&mi=10&mic=40 that make use of MFC to do things like dockable windows don't properly draw the close button on docked windows. Instead of an 'x' it looked more like an 'r'. After some investigation and traces I saw that wine was substituting Arial in for Marlett when Marlett was specified with a DEFAULT_CHARSET. I changed the behaviour to instead load 'webdings' when this situation was encountered. This changed the font drawn on the button from an Arial 'r' to a Webding close 'x' character. Unfortunately it was drawn well below the actual button. I am not sure of the correct way to fix this. I have included a changed line: if(ppem <= startsz || ppem > endsz) that corrects this but I doubt it's correct. Justin Chevrier Changelog: Allow MFC programs that dock windows to draw a correct close button. _________________________________________________________________ STOP MORE SPAM with the new MSN 8 and get 2 months FREE* http://join.msn.com/?page=dept/bcomm&pgmarket=en-ca&RU=http%3a%2f%2fjoin.ms…

1 0

Re: [QUARTZ] Add implementation for IFilterMapper interface
by Robert Shearman 01 Mar '04

01 Mar '04

Christian Costa wrote: > > Hi, > > This patch adds implementation for the IFilterMapper interface. Nice. I have few comments (see below). > However filters registered with this interface require some work in > devenum to > be seen from application. This will be done when time permits. Ok. I had assumed devenum was complete, but obviously not. Does it spit out any fixme's? ... > @@ -879,7 +893,7 @@ > if (SUCCEEDED(hrSub)) > hrSub = > ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &clsidCat, > &pEnum, 0); > > - if (SUCCEEDED(hrSub)) > + if (SUCCEEDED(hrSub) && (hrSub == S_OK)) You can remove the SUCCEEDED(hrSub) completely here. ... > + if (SUCCEEDED(hrSub)) > + { > + len = (strlenW((WCHAR*)&V_UNION(&var, bstrVal))+1) * > sizeof(WCHAR); > + if (!(regfilters[idx].Name = CoTaskMemAlloc(len*2))) > + hr = E_OUTOFMEMORY; > + } > + > + if (SUCCEEDED(hrSub)) > + { > + memcpy(regfilters[idx].Name, &V_UNION(&var, bstrVal), len); > + regfilters[idx].Clsid = clsid; > + idx++; > + } Indentation messed up a bit here and many other places. ... > + if (cFetched > 0) > + { > + for(i = 0; i < cFetched; i++) { > + /* The string in the REGFILTER structure must be > allocated in the same block as the REGFILTER structure itself */ > + ppRegFilter[i] = > (REGFILTER*)CoTaskMemAlloc(sizeof(REGFILTER)+(strlenW(This->RegFil > ters[i].Name)+1)*sizeof(WCHAR)); > + if (!ppRegFilter[i]) { > + while(i) { > + CoTaskMemFree(ppRegFilter[--i]); > + ppRegFilter[i] = NULL; > + } > + return E_OUTOFMEMORY; > + } > + ppRegFilter[i]->Clsid = This->RegFilters[i].Clsid; > + ppRegFilter[i]->Name = > (WCHAR*)((char*)ppRegFilter[i]+sizeof(REGFILTER)); > + CopyMemory(ppRegFilter[i]->Name, > This->RegFilters[i].Name, > (strlenW(This->RegFilters[i].Name)+1)*sizeof(WCHAR)); > + } Please choose one style of bracket placement and stick to it (this occurs in a few places too). Other than these things, it looks fine. Rob

3 5

My patch?
by Robert van Herk 01 Mar '04

01 Mar '04

Hi, Did my patch of 2/17, that allowed for more options in the libraries dialogue of winecfg, go into the "silent void" that the wine website speaks of? :-). I didn't see any notice about it on this list... Grtz, Robert

2 1

Borland C++ 5.5 fails on Link, any ideas?
by Michael Pyne 01 Mar '04

01 Mar '04

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi all, I've been trying to use the free Borland C++ 5.5 command-line tools to compile some Windows applications for my school assignments. To be specific, I am in a graphics class where every turnin has to be Windows. :-( Anyways, Borland C++ runs fine until it tries to link the program in question, at which point ilink32.exe just sits there and eats CPU cycles. I've tried letting it run in case it was simply slower than normal due to the Wine layer, but that doesn't seem to be case (I've let it sit for minutes at a time). This occurs no matter how I run it (with wine or either of wineconsole's two modes). I was wondering if there is a way I can help figure out what the problem is so that we can get this bug fixed. Obligatory specs: OS: Gentoo w/ Linux 2.6.3 (Wine was not compiled using NPTL, but OpenGL support is in) ATI OpenGL drivers XFree86 4.3 GCC 3.3.1 Using fake_windows support Please CC: any replies to me, as I am not subscribed to this list. Also, let me know if there is any other information which would be useful. Regards, - Michael Pyne -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (GNU/Linux) iD8DBQFAQVAQqjQYp5Omm0oRAofOAKDEhWcFavrlg/3VdjMOcx90hF/iiwCgvWUj IS/FYImIKOxThQRj89LvwYc= =+Gxw -----END PGP SIGNATURE-----

6 7

Re: SafeArrayCreateVector
by Alexandre Julliard 01 Mar '04

01 Mar '04

"Martin Fuchs" <martin-fuchs(a)gmx.net> writes: > Changelog: > correct parameter type for SafeArrayCreateVector() and SafeArrayCreateVectorEx() from ULONG to UINT The Microsoft headers have ULONG here, what headers are you using? -- Alexandre Julliard julliard(a)winehq.org

2 1

Authors.c Won't Compile
by Robert Shearman 01 Mar '04

01 Mar '04

Hi, I can't compile authors.c due to some encoding issue with sed. I can generate the authors.c file fine on the command line, but the same command in the Makefile won't generate compilable code due to it terminating the string constant before a UTF-8 character. I am using Fedora Core 1 with latest updates. $ sed --version GNU sed version 4.0.8 Rob Example of errors: authors.c:19: error: stray '\366' in program authors.c:20: error: `m' undeclared here (not in a function) authors.c:20: error: initializer element is not constant authors.c:20: error: (near initialization for `SHELL_Authors[18]') authors.c:20: error: syntax error before string constant

2 7

Re: Program crash when moving a scrollbar
by Alexandre Julliard 01 Mar '04

01 Mar '04

"Norbert Feulner" <feulner.norbert(a)web.de> writes: > WINPROC_MapMsg16To32A is used to restore some of the original values. It is called by > __wine_call_wndproc_32W (line 4). > > Here I added for the case of message msg16 equals SBM_GETRANGE to extend pwparam32 > to its 32-Bit value. This is done by using the upper word from plparam. This is wrong, wParam and lParam don't necessarily have the same high word. This problem has been discussed already, what needs to be done is to investigate how SBM_GETRANGE works on 16-bit Windows and then implement the proper translation based on that. -- Alexandre Julliard julliard(a)winehq.org

1 0

OLEPictureImpl_SaveAsFile
by Ross Clement 01 Mar '04

01 Mar '04

Hi. I have an application (Halosim3) that I would like to have working under wine. The application works reasonably well, but is unable to save pictures to disk. With a bit of tracking, I've discovered that it calls OLEPictureImpl_SaveAsFile to save the image that it generates. This function (in dlls/oleaut32/olepicture.c) is a "stub" only, and writes back This->datalen bytes of This->data. Looking at the code further, it seems that This->data is only initialised when an image is loaded from disk. Hence any image editing or creating program that creates an image in memory, or modifies an image after it is loaded, won't work. I would like to ask if anyone is working on OLEPictureImpl_SaveAsFile, or planning to. Otherwise I may have a hack at it myself. I'm not subscribed to the winehq mailing list, but will check the archives sometime in the future. If anyone wants to contact me quicker than that, please cc it to my email address as per this email. Cheers, Ross-c -- -- Ross Clement (Dr) Senior Lecturer in Artificial Intelligence Harrow School of Computer Science University of Westminster Northwick Park Middlesex UK HA1 3TP clemenr _at_ wmin.ac.uk +44-20-7911-5000 ext. 4159

2 1

"Warning: Language '' was not recognized"
by Joel Konkle-Parker 01 Mar '04

01 Mar '04

I've looked through the archives for an answer to this, but didn't find anything. When I run `wine ie6setup.exe` using Wine from CVS, the first lines are the following: -- Warning: Language '' was not recognized, defaulting to English. Building font metrics. This may take some time... -- Where is this language warning coming from? Thanks in advance. -- Joel Konkle-Parker Webmaster [Ballsome.com] E-mail [jjk3(a)msstate.edu]

1 0

Re: ole: define MKSYS_URLMONIKER
by Francois Gouget 01 Mar '04

01 Mar '04

On Sun, 29 Feb 2004, Kevin Koltzau wrote: > Define MKSYS_URLMONIKER. This is not defined in any Windows headers I > can find, but does exist. Just FYI, I checked and it is present in the latest Microsoft SDK: sdk/include/UrlMon.h:#define MKSYS_URLMONIKER 6 It is also defined in ObjIdl.Idl. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ We are Pentium of Borg. You will be approximated. Division is futile.

1 0

Sibelius 2
by Andrew L. Bereson 01 Mar '04

01 Mar '04

Sibelius is an app for scoring music. Sibelius 1 runs fine with wine. Sibelius 2 crashes on startup. When it crashes there is no useful message, only "Unhandled exception". Using winedbg I have found that Sibelius appears to be following a NULL pointer. I haven't yet managed to track down where it's getting the bad pointer from... any suggestions would be appreciated. I've got some time and energy to try to make this work, but first... Has anyone else worked or is some else currently working on this? What did you find? How far did you get? -- Andrew L. Bereson bereson(a)sea-ware.com (800)307-5754

2 1

winxp version info
by Ivan Leo Murray-Smith 29 Feb '04

29 Feb '04

To avoid problems like this one that recently appeared in the newsgroup > Wine emulates XP which is good, > however upon attempting installation it springs up a message requiring > that i have my pc install SP1 it may be a good idea to set the winxp emulation to return the values of winxp sp1. Ivan.

1 0

Re: [QUARTZ] Add implementation for IFilterMapper interface (RESEND)
by Tom 29 Feb '04

29 Feb '04

Christian Costa wrote: > Hi, > > This time wih Rob's suggestions. > > Bye. > > Changelog : > Implemented IFilterMapper and IEnumRegFilters interfaces. > Fixed IFilterMapper2_EnumMatchingFilters. > > Christian Costa titan.costa(a)wanadoo.fr > Hi Christian, Should I add you as a worker on quartz? Tom

2 1

Re: help
by Tom 29 Feb '04

29 Feb '04

Matt Jaggard wrote: > > hi, I left a message, a longgg time ago on your website, > I was wondering if you could please delete mjaggard(a)blueyonder.co.uk > <mailto:mjaggard@blueyonder.co.uk>. As I do not want spammers picking my > address up. Thanks, > The URL my address is on is called. > http://www.winehq.org/hypermail/wine-users/2000/12/0438.html. if you > could delete references to mjaggard(a)blueyonder.co.uk > <mailto:mjaggard@blueyonder.co.uk> or the page that would be brill > > Many Thanks > > M Jaggard This is a joke or what? Now you real addy with out the ( _ ) in it is on wine-devel not only by your post but with my reply as well... Your odds of being spammed have just increased by some 200% ... But don't worry spam is really good for you..... :) My dear sweet Grandma use to keep us nice and fat on it when we were just little tikes.. Tom

1 0

Re: GetDefaultPrinter A->W [resubmit]
by Alexandre Julliard 28 Feb '04

28 Feb '04

Stefan Leichter <Stefan.Leichter(a)camLine.com> writes: > Hello, > i sent this patch one week ago, but it does not get commited. Anything wrong > with it? The handling of the buffer sizes looks very suspicious. For instance you check for namesize being NULL, but later on assign something to it anyway. Also allocations have to be in bytes but length arguments (for instance in the GetProfileStringW call) have to be in WCHARs, this isn't done correctly. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: PATCH: Compatibility issue with InternetCrackUrlA
by wire 28 Feb '04

28 Feb '04

Hi. I have modified my patch about compatibility of InternetCrackUrlA function,to deal with the failed case. If the pointer member of one component is set to point a buffer,but the length member is not big enough,then the component should not be returned, and the length member is set to the value needed. And later i'll post the patch for the conformance test. Bye. ChangeLog: Fill the nPort field with the corresponding scheme; Fix the path and extrainfo components' parse; Deal with the failed case. Index: wine/dlls/wininet/internet.c =================================================================== RCS file: /home/wine/wine/dlls/wininet/internet.c,v retrieving revision 1.73 diff -u -r1.73 internet.c --- wine/dlls/wininet/internet.c 30 Dec 2003 19:16:37 -0000 1.73 +++ wine/dlls/wininet/internet.c 28 Feb 2004 10:22:19 -0000 @@ -845,29 +845,28 @@ DWORD nLength; URL_COMPONENTSW UCW; WCHAR* lpwszUrl; + BOOL result; if(dwUrlLength==0) dwUrlLength=strlen(lpszUrl); lpwszUrl=HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(dwUrlLength+1)); memset(lpwszUrl,0,sizeof(WCHAR)*(dwUrlLength+1)); nLength=MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,lpwszUrl,dwUrlLength+1); - memset(&UCW,0,sizeof(UCW)); - if(lpUrlComponents->dwHostNameLength!=0) - UCW.dwHostNameLength=1; - if(lpUrlComponents->dwUserNameLength!=0) - UCW.dwUserNameLength=1; - if(lpUrlComponents->dwPasswordLength!=0) - UCW.dwPasswordLength=1; - if(lpUrlComponents->dwUrlPathLength!=0) - UCW.dwUrlPathLength=1; - if(lpUrlComponents->dwSchemeLength!=0) - UCW.dwSchemeLength=1; - if(lpUrlComponents->dwExtraInfoLength!=0) - UCW.dwExtraInfoLength=1; - if(!InternetCrackUrlW(lpwszUrl,nLength,dwFlags,&UCW)) - { - HeapFree(GetProcessHeap(), 0, lpwszUrl); - return FALSE; - } + + memcpy(&UCW,lpUrlComponents,sizeof(UCW)); + if (UCW.lpszScheme && UCW.dwSchemeLength) + UCW.lpszScheme = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(UCW.dwSchemeLength+1)); + if (UCW.lpszHostName && UCW.dwHostNameLength) + UCW.lpszHostName = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(UCW.dwHostNameLength+1)); + if (UCW.lpszUserName && UCW.dwUserNameLength) + UCW.lpszUserName = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(UCW.dwUserNameLength+1)); + if (UCW.lpszPassword && UCW.dwPasswordLength) + UCW.lpszPassword = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(UCW.dwPasswordLength+1)); + if (UCW.lpszUrlPath && UCW.dwUrlPathLength) + UCW.lpszUrlPath = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(UCW.dwUrlPathLength+1)); + if (UCW.lpszExtraInfo && UCW.dwExtraInfoLength) + UCW.lpszExtraInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(UCW.dwExtraInfoLength+1)); + result = InternetCrackUrlW(lpwszUrl,nLength,dwFlags,&UCW); + ConvertUrlComponentValue(&lpUrlComponents->lpszHostName, &lpUrlComponents->dwHostNameLength, UCW.lpszHostName, UCW.dwHostNameLength, lpszUrl, lpwszUrl); @@ -888,7 +887,19 @@ lpszUrl, lpwszUrl); lpUrlComponents->nScheme=UCW.nScheme; lpUrlComponents->nPort=UCW.nPort; + lpUrlComponents->dwSchemeLength=UCW.dwSchemeLength; + lpUrlComponents->dwHostNameLength=UCW.dwHostNameLength; + lpUrlComponents->dwUserNameLength=UCW.dwUserNameLength; + lpUrlComponents->dwPasswordLength=UCW.dwPasswordLength; + lpUrlComponents->dwUrlPathLength=UCW.dwUrlPathLength; + lpUrlComponents->dwExtraInfoLength=UCW.dwExtraInfoLength; HeapFree(GetProcessHeap(), 0, lpwszUrl); + HeapFree(GetProcessHeap(), 0, UCW.lpszScheme); + HeapFree(GetProcessHeap(), 0, UCW.lpszHostName); + HeapFree(GetProcessHeap(), 0, UCW.lpszUserName); + HeapFree(GetProcessHeap(), 0, UCW.lpszPassword); + HeapFree(GetProcessHeap(), 0, UCW.lpszUrlPath); + HeapFree(GetProcessHeap(), 0, UCW.lpszExtraInfo); TRACE("%s: scheme(%s) host(%s) path(%s) extra(%s)\n", lpszUrl, debugstr_an(lpUrlComponents->lpszScheme,lpUrlComponents->dwSchemeLength), @@ -896,7 +907,7 @@ debugstr_an(lpUrlComponents->lpszUrlPath,lpUrlComponents->dwUrlPathLength), debugstr_an(lpUrlComponents->lpszExtraInfo,lpUrlComponents->dwExtraInfoLength)); - return TRUE; + return result; } /*********************************************************************** @@ -972,10 +983,14 @@ } else { - INT ncpylen = min((*dwComponentLen)-1, len); - strncpyW(*lppszComponent, lpszStart, ncpylen); - (*lppszComponent)[ncpylen] = '\0'; - *dwComponentLen = ncpylen; + if (*dwComponentLen<len+1) { + **lppszComponent = '\0'; + *dwComponentLen = len+1; + return FALSE; + } + strncpyW(*lppszComponent, lpszStart, len); + (*lppszComponent)[len] = '\0'; + *dwComponentLen = len; } } @@ -999,6 +1014,8 @@ LPWSTR lpszcp = NULL; WCHAR lpszSeparators[3]={';','?',0}; WCHAR lpszSlash[2]={'/',0}; + BOOL result = TRUE; + if(dwUrlLength==0) dwUrlLength=strlenW(lpszUrl); @@ -1027,12 +1044,12 @@ /* Parse <params> */ lpszParam = strpbrkW(lpszap, lpszSeparators); - if (lpszParam != NULL) + if (lpszParam != NULL && (lpUC->dwExtraInfoLength || lpUC->lpszExtraInfo)) { if (!SetUrlComponentValueW(&lpUC->lpszExtraInfo, &lpUC->dwExtraInfoLength, lpszParam, dwUrlLength-(lpszParam-lpszUrl))) { - return FALSE; + result = FALSE; } } @@ -1045,7 +1062,7 @@ lpUC->nScheme = GetInternetSchemeW(lpszUrl, lpszcp - lpszUrl); if (!SetUrlComponentValueW(&lpUC->lpszScheme, &lpUC->dwSchemeLength, lpszUrl, lpszcp - lpszUrl)) - return FALSE; + result = FALSE; /* Eat ':' in protocol. */ lpszcp++; @@ -1112,14 +1129,16 @@ lpszcp++; } - SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, - lpszUser, lpszPasswd - lpszUser); + if (!SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, + lpszUser, lpszPasswd - lpszUser)) + result = FALSE; if (lpszPasswd != lpszHost) lpszPasswd++; - SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, + if (!SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, lpszPasswd == lpszHost ? NULL : lpszPasswd, - lpszHost - lpszPasswd); + lpszHost - lpszPasswd)) + result = FALSE; lpszcp++; /* Advance to beginning of host */ } @@ -1133,8 +1152,9 @@ entire string up to the first '/' */ if(lpUC->nScheme==INTERNET_SCHEME_RES) { - SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, - lpszHost, lpszPort - lpszHost); + if (!SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, + lpszHost, lpszPort - lpszHost)) + result = FALSE; lpUC->nPort = 0; lpszcp=lpszNetLoc; } @@ -1158,12 +1178,29 @@ } else { - SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, - lpszHost, lpszPort - lpszHost); + if (!SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, + lpszHost, lpszPort - lpszHost)) + result = FALSE; if (lpszPort != lpszNetLoc) lpUC->nPort = atoiW(++lpszPort); else - lpUC->nPort = 0; + switch(lpUC->nScheme) { + case INTERNET_SCHEME_FTP: + lpUC->nPort = INTERNET_DEFAULT_FTP_PORT; + break; + case INTERNET_SCHEME_HTTPS: + lpUC->nPort = INTERNET_DEFAULT_HTTPS_PORT; + break; + case INTERNET_SCHEME_HTTP: + lpUC->nPort = INTERNET_DEFAULT_HTTP_PORT; + break; + case INTERNET_SCHEME_GOPHER: + lpUC->nPort = INTERNET_DEFAULT_GOPHER_PORT; + break; + default: + lpUC->nPort = 0; + break; + } } } } @@ -1198,7 +1235,7 @@ if (!SetUrlComponentValueW(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, lpszcp, len)) - return FALSE; + result = FALSE; } else { @@ -1210,7 +1247,7 @@ debugstr_wn(lpUC->lpszUrlPath,lpUC->dwUrlPathLength), debugstr_wn(lpUC->lpszExtraInfo,lpUC->dwExtraInfoLength)); - return TRUE; + return result; } /***********************************************************************

1 0

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