January 2005 - Wine-Devel - list.winehq.org

Re: Setupapi - (Take 2) implement MyFree, MyMalloc and MyRealloc
by Huw D M Davies Jan. 24, 2005

Jan. 24, 2005

On Sun, Jan 23, 2005 at 08:42:52PM -0800, Steven Edwards wrote: > Changelog: > Eric Kohl <eric.kohl(a)t-online.de> > Implement MyFree, MyMalloc and MyRealloc ... > --- /dev/null 2005-01-23 12:40:28.000000000 -0500 > +++ misc.c 2005-01-23 18:50:33.000000000 -0500 > +LPVOID WINAPI MyMalloc(DWORD dwSize) > +{ > + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); > +} > + ... > +LPVOID WINAPI MyRealloc(LPVOID lpSrc, DWORD dwSize) > +{ > + if (lpSrc == NULL) > + return HeapAlloc(GetProcessHeap(), 0, dwSize); > + > + return HeapReAlloc(GetProcessHeap(), 0, lpSrc, dwSize); > +} So MyAlloc zeros the memory while MyRealloc doesn't - is this really correct? If so I think a comment, at the very least, is in order. Huw. -- Huw Davies huw(a)codeweavers.com

1 0

Re: MSI: indentation and style cleanup
by Rolf Kalbermatter Jan. 24, 2005

Jan. 24, 2005

On Sat, Jan 22, 2005 at 05:16:45PM +0000, Mike Hearn wrote: > Given that it can be quite complex and introduce new bugs, and given that > it's really quite a useless feature IMHO as modern Linux boxes will hang > themselves in swap hell before returning NULL from malloc I don't think > this should be a janitorial project. While I agree this may be not an easy thing to do without looking at the whole code very throughly I think saying that it doesn't help at all because on Linux you will never get this problem is a little shortsighted. Wine doesn't only compile for Linux and there might be other systems with a very straightforward swapping system which will run out of memory before the disk dies from overactivity. Also who says that the next version of Linux or some sort of stress test extension, a security hardened kernel, or a memory quota system on user basis or whatever, will not add an easy to get into out of memory situation. Couldn't Solaris for instance limit the memory available to users on a user base eventhough there are loads and loads of physical memory still available? Rolf Kalbermatter

2 1

Re: [LOSTWAGES] Update howto and downloads page (Second try)
by Tom Jan. 24, 2005

Jan. 24, 2005

Scott Ritchie wrote: > I removed the conflict in this version. I hate CVS. > > This is a rewrite of the howto to make it short and sweet and remove > some of the duplicitous information to link to the User Guide instead. > Once I finish the rewrite of the User Guide, things should look pretty > smooth and easy from a new user's perspective. > > Changelog: > +Rewrite howto to link to user's guide and mention Winetools > +Add special instruction for Debian users to howto > +Make Winetools appear further up on the download's page It looks as if you added Franks Corner back in and removed http://www.von-thadden.de/Joachim/WineTools Frank is no longer the maintainer of winetools so Joachim von Thadden should be left as the maintainer. Tom

2 1

Re: wined3d updates
by Jesse Allen Jan. 24, 2005

Jan. 24, 2005

On Thu, 20 Jan 2005 01:40:00 +0000 (GMT), Oliver Stieber <oliver_stieber(a)yahoo.co.uk> wrote: > --- Oliver Stieber <oliver_stieber(a)yahoo.co.uk> > opps, it helps if I actually attach them > wrote: > > Hi, > > The attached patches: > > > > Bring d3d9.h upto date with MSDN. > > Implement DepthStencils in wined3d. > > Create STUB object for d3d9 functionality not yet > > implemented. > > Start to implement stateblocks in WineD3D. > > Implements point sprites. > > Implements ColorFill. > > Almost fix reference counting. > > And implement some very basic memory management. > > > > > > I'm sorry the patch is so big, it's taken a couple > > of > > days to merge with Jasons changes and perform > > regression testing. > > Hi Oliver, I tried your patches against CVS as of 2004-01-21. I don't believe they have been applied yet. There was one rejection, so I hacked it back in where I could see it. I could have done it wrong, as I only have a crash when loading Pirates -- it follows. So maybe you ought to take a look at rediffing your patch. Thanks for your help, and I'll keep at testing. Jesse fixme:system:SystemParametersInfoW Unimplemented action: 55 (SPI_SETMOUSEKEYS) fixme:system:SystemParametersInfoW Unimplemented action: 59 (SPI_SETSTICKYKEYS) fixme:d3d:IWineD3DImpl_GetDeviceCaps Caps support for directx9 is non-existent at the moment! fixme:d3d:IWineD3DImpl_GetDeviceCaps Caps support for directx9 is non-existent at the moment! fixme:d3d:IWineD3DImpl_GetDeviceCaps Caps support for directx9 is non-existent at the moment! wine: Unhandled exception (thread 0009), starting debugger... WineDbg starting on pid 0x8 Unhandled exception: page fault on write access to 0x4a18bd19 in 32-bit code (0x4a18e98a). In 32 bit mode. Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:0000 EIP:4a18e98a ESP:4068fa94 EBP:4068f9c0 EFLAGS:00210246( - 00 -RIZP1) EAX:4a1b2e68 EBX:4a1b2314 ECX:000000ad EDX:4a181131 ESI:42800000 EDI:403ec130 Stack dump: 0x4068fa94: 00000000 00000000 00000000 00000000 0x4068faa4: 00000000 00000000 00000000 00000000 0x4068fab4: 00000000 00000000 00000000 00000000 0x4068fac4: 00000000 00000000 00000020 00000320 0x4068fad4: 00000258 00000000 00000000 00000000 0x4068fae4: 00000000 00000000 00000000 00000000 Backtrace: =>1 0x4a18e98a IWineD3DStateBlockImpl_InitStartupStateBlock+0x5ba(iface=0x4a181131) [stateblock.c:171] in wined3d (0x4068f9c0) 2 0x4a181131 IWineD3DDeviceImpl_SetTextureStageState+0x11(iface=0xffffd4b3, Stage=0x806f6ff, Type=0xf147d8b, Value=0x1ac685) [/home/jesse/wine/dlls/wined3d/device.c:3011] in wined3d (0x4a181131) 0x4a18e98a IWineD3DStateBlockImpl_InitStartupStateBlock+0x5ba [stateblock.c:171] in wined3d: movl $0x0,0xabe8(%edx) Unable to open file stateblock.c Wine-dbg>

1 0

Re: setupapi: implement MyFree, MyMalloc and MyRealloc
by Jonathan Wilson Jan. 24, 2005

Jan. 24, 2005

Looks like the new misc.c is missing from the patch...

1 0

Re: [Resend] wineloader: call wineprefixcreate with explicit WINEPREFIX
by Alexandre Julliard Jan. 23, 2005

Jan. 23, 2005

Crestez Leonard <cleonard(a)go.ro> writes: > This allows you do "export WINEPREFIX=~/.wine-zzz; ./wine regedit", > and automatically generate ~/.wine-zzz. You used to have to call > wineprefixcreate yourself, with correct parameters. Actually this is a feature ;-) The rationale is that if you make a typo in your WINEPREFIX it's better to get an error message than to silently create a new hierarchy and having things fail in mysterious ways. So you have to run wineprefixcreate to confirm that you really meant to use a non-existent WINEPREFIX. -- Alexandre Julliard julliard(a)winehq.org

2 1

Wine Knowledge Base
by Mike Hearn Jan. 23, 2005

Jan. 23, 2005

Hi, I was going to wait a while (until it had a bit more content) before announcing this here, but as it seems people are setting up Wikis etc already here is my 2 cents: http://navi.cx/svn/misc/trunk/winekb/index.xml ** THIS IS NOT A WIKI ** Instead, it's a mini website that uses a simple dialect of XML suitable for embedding code and random text into. It's designed to be: - Easy to improve - Visually appealing - Controlled What do I mean by these things? Firstly, easy to improve: if you want to add some content to a page, save or wget the file to disk, edit it in your favourite text editor, and then send me the diff (or the full file and I'll diff it for you). You don't need any web design skill, as you can see if you do a "View Source" in the page. Secondly, visually appealing: I dislike the way Wikis look most of the time. XSL:T is a nice language for doing tree transformations so I used it. The page code looks like this: <kbpage title="Index"> <section title="Users"> * Installing <l>NativeMSI</l> and <l>NativeDCOM</l> * The <l>ConfigFile</l> * <a href="http://bylands.dur.ac.uk/~mh/wine-faq.html">#winehq channel faq</a> - read this when you have an issue </section> <section title="Developers"> * <l>AddingStuff</l> to this site * <l>InterestingPatches</l> * <l>WinelibAsBinaries</l> </section> </kbpage> See? It's easy. Yet the resulting pages looks quite nice IMHO and are uniform in style. There's a new page template here: http://navi.cx/svn/misc/trunk/winekb/template.xml Thirdly, controlled: one of the objections Newman always had to a Wiki was that it'd fill up with crap or become another appdb, and then he'd have to maintain it. You can contribute to the knowledge base by sending patches to me or to wine-devel (if you think others would find the text useful), same as any other project. I won't be adding anything there that duplicates the appdb except maybe for extremely popular programs and libraries like MSI and DCOM. You can hack on it in other ways: the code for the site is managed using Subversion/SVK, so you can check out a copy of it like so: $ svn co http://navi.cx/svn/misc/trunk/winekb If you want to do a lot of work on it, use SVK which will let you branch changes and commit locally so you can keep your patches separated nicely. Right now there isn't much content. There's some stuff for users, like how to set up a basic config file, how to install native DCOM etc, and there is stuff for developers like a list of interesting-yet-bounced patches and some notes on the "Winelib programs as binaries" work me and Vincent did. It's designed for content that doesn't really fit the main WineHQ website. If I think something makes more sense in the developer guide I'll ask you to send the content there. In other words, the KB is designed to be half-way between the structured and professional WineHQ website and a Wiki. Hope that helps! thanks -mike

2 3

New dcom95 mirror
by Ivan Leo Puoti Jan. 23, 2005

Jan. 23, 2005

Hello, as Jeremy Newman wanted mirrors for dcom95, here's a new link http://www003.portalis.it/115/download/dcom95.zip Note that because of the Microsoft licencing conditions, you are licenced to download this file only if you are going to use it with wine. Ivan.

1 0

Simple web based presentation system useful for WineConf
by Mike Hearn Jan. 23, 2005

Jan. 23, 2005

Hi, With the spring comes WineConf 2005, and perhaps some interesting presentations by people. Last time I went to WineConf I was asked to write a mini presentation to show newbies what Wine hacking was all about. In the end, there weren't many non-Wine developers there (which is what you'd expect, really) so we just had a discussion about how to reduce the learning curve instead. In retrospect that was far more interesting and useful than any presentation I could have done. Nonetheless, that presentation was there and when I wrote it, I also wrote a little XSL transform for slide shows. That's because I don't like PowerPoint that much, especially I don't like how sucky its web export is and slideshows are good to put on the web. So here is the presentation itself: http://bylands.dur.ac.uk/~mh/wineconf2004/presentation.xml Just load it into a web browser like Mozilla or even IE6 (konq doesn't support xslt, sorry). As you can see it's nicely Wine themed :) Here is the transform if you want to use the same presentation system yourself: http://navi.cx/~mike/xslt-slides/gen.xsl Just look at the source code of presentation.xml to see how to use it. I'm hoping we'll have a similar mix for this years Wineconf as last year - Lionels OpenGL/games presentation in particular was interesting, but I think the mix of discussion and presentations was good. One problem with presentations is that they tend to be in quite specialist areas, eg a DCOM presentation wouldn't be all that useful because there aren't many people working on it. So I think a bias more towards discussion of process and project organisation, things like that, would be more useful. That's just my humble opinion of course ;) thanks -mike

2 2

Nagging on Wineconf
by Jeremy White Jan. 23, 2005

Jan. 23, 2005

Hi all, Okay, we've got 19 rsvp's for Wineconf. And that's missing me and a lot of other people that I know will be there, so shame on me and shame on you. So get over to www.winehq.org/wineconf and rsvp (including fellow folks from CodeWeavers; if you're reading this, you better plan on being there <grin>). In all seriousness, we really need an accurate head count so we can plan properly; if there really only will be 25-30 people, that makes things a good bit different than 75 people. While you're there, join the wine-conf mailing list; I think that's the most appropriate place for us to start the discussions of the agenda and to start fine tuning the details. So if you don't subscribe to wine-conf, but you're planning to go, you're going to start missing out on everything but the nag messages <grin>. Cheers, Jer

1 0

Re: olepicture.c compile failure : "structure has no member named `UserData', implicit declaration of function `DGifOpen'"
by Marcus Meissner Jan. 23, 2005

Jan. 23, 2005

On Fri, Jan 21, 2005 at 06:45:11PM -0800, Rizwan Kassim wrote: > Oh, I see what you mean. > > I've found that getting the latest version of libgif and copying > gif_lib.h into the local directory (and including it in > LD_LIBRARY_PATH) seems to at least halt compile errors. > > Reason I'm asking about what to do now, is that if this is a problem > that might be encountered, it makes sense that the configure or make > script should detect and "fix" it... > > Updated script at http://www.geekymedia.com/twiki/bin/view.cgi/WineDev/LugWine > > Any thoughts? No, it should work better with the installed system itself. I am building RPMs with defined chroots and have no problems. This script is just a major hack. If you have problems it should have been checked and/or found by the configure script. Ciao, Marcus

1 0

Re: [LOSTWAGES] Update howto and downloads page
by Mike Hearn Jan. 23, 2005

Jan. 23, 2005

On Sat, 22 Jan 2005 17:32:24 -0800, Scott Ritchie wrote: > +<<<<<<< download.template > +======= Whoops, a merge conflict marker sneaked in there!

1 0

More DCOM notes
by Mike Hearn Jan. 23, 2005

Jan. 23, 2005

Here are some more notes in a convenient to read form. I'll turn these into a documentation patch later. Rob, can you double-check this? This document assumes you are familiar with the basics of DCOM. If you aren't read this first: http://winehq.com/site/docs/wine-devel/dcom-1 This is not suitable study material for beginners. Don't say I didn't warn you. * Apartments Before a thread can use COM it must enter an apartment. Apartments are an abstraction of a COM objects thread safety level. There are many types of apartment but the only two we care about right now are single threaded apartments (STAs) and the multi-threaded apartment (MTA). Any given process may contain at most one MTA and potentially many STAs. You enter an apartment by calling CoInitializeEx and passing the desired thread model in as a parameter. The default if you use the deprecated CoInitialize is a STA, and this is the most common type of apartment used in COM. An object in the multi-threaded apartment may be accessed concurrently by multiple threads: eg, it's supposed to be entirely thread safe. It must also not care about thread-affinity, the object should react the same way no matter which thread is calling it. An object inside a STA does not have to be thread safe, and all calls upon it should come from the same thread - the thread that entered the apartment in the first place. The apartment system was originally designed to deal with the disparity between the Windows NT/C++ world in which threading was given a strong emphasis, and the Visual Basic world in which threading was barely supported and even if it had been fully supported most developers would not have used it. Visual Basic code is not truly multi-threaded, instead if you start a new thread you get an entirely new VM, with separate sets of global variables. Changes made in one thread do NOT reflect in another, which pretty much violates the expected semantics of multi- threading entirely but this is Visual Basic, so what did you expect? If you access a VB object concurrently from multiple threads, behind the scenes each VM runs in a STA and the calls are marshaled between the threads using DCOM. In the Windows 2000 release of COM, several new types of apartment were added, the most important of which are RTAs (the rental threaded apartment) in which concurrent access are serialised by COM using an apartment-wide lock but thread affinity is not guaranteed. * Structure of a marshaled interface pointer When an interface is marshaled using CoMarshalInterface, the result is a serialized OBJREF structure. An OBJREF actually contains a union, but we'll be assuming the variant that embeds a STDOBJREF here which is what's used by the system provided standard marshaling. A STDOBJREF (standard object reference) consists of the magic signature 'MEOW', then some flags, then the IID of the marshaled interface. Quite what MEOW stands for is a mystery, but it's definitely not "Microsoft Extended Object Wire". Next comes the STDOBJREF flags, identified by their SORF_ prefix. Most of these are reserved, and their purpose (if any) is unknown, but a few are defined. After the SORF flags comes a count of the references represented by this marshaled interface. Typically this will 1 in the case of a normal marshal, but may be 5 for table-strong marshals and 0 for table-weak marshals (the difference between these is explained below). The most interesting part of a STDOBJREF is the OXID, OID, IPID triple. This triple identifies any given marshaled interface pointer in the network. OXIDs are apartment identifiers, and are supposed to be unique network-wide. How this is guaranteed is currently unknown: the original algorithm Windows used was something like the current UNIX time and a local counter. OXIDs are generated and registered with the OXID resolver by performing local RPCs to the RPC subsystem (rpcss.exe). In a fully security-patched Windows system they appear to be randomly generated. This registration is done using the ILocalOxidResolver interface, however the exact structure of this interface is currently unknown. OIDs are object identifiers, and identify a stub manager. The stub manager manages interface stubs. For each exported COM object there are multiple interfaces and therefore multiple interface stubs (IRpcStubBuffer implementations). OIDs are apartment scoped. Each ifstub is identified by an IPID, which identifies a marshaled interface pointer. IPIDs are apartment scoped. Unmarshaling one of these streams therefore means setting up a connection to the object exporter (the apartment holding the marshaled interface pointer) and being able to send RPCs to the right ifstub. Each apartment has its own RPC endpoint and calls can be routed to the correct interface pointer by embedding the IPID into the call using RpcBindingSetObject. IRemUnknown, discussed below, uses a reserved IPID. Both standard and handler marshaled OBJREFs contains an OXID resolver endpoint which is an RPC string binding in a DUALSTRINGARRAY. This is necessary because an OXID alone is not enough to contact the host, as it doesn't contain any network address data. Instead, the combination of the remote OXID resolver RPC endpoint and the OXID itself are passed to the local OXID resolver. It then returns the apartment string binding. This step is an optimisation: technically the OBJREF itself could contain the string binding of the apartment endpoint and the OXID resolver could be bypassed, but by using this DCOM can optimise out a server round-trip by having the local OXID resolver cache the query results. The OXID resolver is a service in the RPC subsystem (rpcss.exe) which implements a raw (non object-oriented) RPC interface called IOXIDResolver. Despite the identical naming convention this is not a COM interface. Unmarshaling an interface pointer stream therefore consists of reading the OXID, OID and IPID from the STDOBJREF, then reading one or more RPC string bindings for the remote OXID resolver. Then RpcBindingFromStringBinding is used to convert this remote string binding into an RPC binding handle which can be passed to the local IOXIDResolver::ResolveOxid implementation along with the OXID. The local OXID resolver consults its list of same-machine OXIDs, then its cache of remote OXIDs, and if not found does an RPC to the remote OXID resolver using the binding handle passed in earlier. The result of the query is stored for future reference in the cache, and finally the unmarshaling application gets back the apartment string binding, the IPID of that apartments IRemUnknown implementation, and a security hint (let's ignore this for now). Once the remote apartments string binding has been located the unmarshalling process constructs an RPC Channel Buffer implementation with the connection handle and the IPID of the needed interface, loads and constructs the IRpcProxyBuffer implementation for that IID and connects it to the channel. Finally the proxy is passed back to the application. * Handling IUnknown There are some subtleties here with respect to IUnknown. IUnknown itself is never marshaled directly: instead a version of it optimised for network usage is used. IRemUnknown is similar in concept to IUnknown except that it allows you to add and release arbitrary numbers of references at once, and it also allows you to query for multiple interfaces at once. IRemUnknown is used for lifecycle management, and for marshaling new interfaces on an object back to the client. Its definition can be seen in dcom.idl - basically the IRemUnknown::RemQueryInterface method takes an IPID and a list of IIDs, then returns STDOBJREFs of each new marshaled interface pointer. There is one IRemUnknown implementation per apartment, not per stub manager as you might expect. This is OK because IPIDs are apartment not object scoped. * Table marshaling Normally once you have unmarshaled a marshaled interface pointer that stream is dead, you can't unmarshal it again. Sometimes this isn't what you want. In this case, table marshaling can be used. There are two types: strong and weak. In table-strong marshaling, selected by a specific flag to CoMarshalInterface, a stream can be unmarshaled as many times as you like. Even if all the proxies are released, the marshaled object reference is still valid. Effectively the stream itself holds a ref on the object. To release the object entirely so its server can shut down, you must use CoReleaseMarshalData on the stream. In table-weak marshaling the stream can be unmarshaled many times, however the stream does not hold a ref. If you unmarshal the stream twice, once those two proxies have been released remote object will also be released. Attempting to unmarshal the stream at this point will yield CO_E_DISCONNECTED. * RPC dispatch Exactly how RPC dispatch occurs depends on whether the exported object is in a STA or the MTA. If it's in the MTA then all is simple: the RPC dispatch thread can temporarily enter the MTA, perform the remote call, and then leave it again. If it's in a STA things get more complex, because of the requirement that only one thread can ever access the object. Instead, when entering a STA a hidden window is created implicitly by COM, and the user must manually pump the message loop in order to service incoming RPCs. The RPC dispatch thread performs the context switch into the STA by sending a message to the apartments window, which then proceeds to invoke the remote call in the right thread. RPC dispatch threads are pooled by the RPC runtime. When an incoming RPC needs to be serviced, a thread is pulled from the pool and invokes the call. The main RPC thread then goes back to listening for new calls. It's quite likely for objects in the MTA to therefore be servicing more than one call at once. * Message filtering and re-entrancy When an outgoing call is made from a STA, it's possible that the remote server will re-enter the client, for instance to perform a callback. Because of this potential re-entrancy, when waiting for the reply to an RPC made inside a STA, COM will pump the message loop. That's because while this thread is blocked, the incoming callback will be dispatched by a thread from the RPC dispatch pool, so it must be processing messages. While COM is pumping the message loop, all incoming messages from the operating system are filtered through one or more message filters. These filters are themselves COM objects which can choose to discard, hold or forward window messages. The default message filter drops all input messages and forwards the rest. This is so that if the user chooses a menu option which triggers an RPC, they then cannot choose that menu option *again* and restart the function from the beginning. That type of unexpected re-entrancy is extremely difficult to debug, so it's disallowed. Unfortunately other window messages are allowed through, meaning that it's possible your UI will be required to repaint itself during an outgoing RPC. This makes programming with STAs more complex than it may appear, as you must be prepared to run all kinds of code any time an outgoing call is made. In turn this breaks the idea that COM should abstract object location from the programmer, because an object that was originally free-threaded and is then run from a STA could trigger new and untested codepaths in a program. Oh well, it was nice in theory. thanks -mike

2 2

WineConf 2005: hotel info
by Brian Vincent Jan. 23, 2005

Jan. 23, 2005

Earlier I added hotel info to the WineConf pages: http://www.winehq.com/site/wineconf/travel Here's what you need to know: - we have 50 rooms reserved for Fri and Sat night, we have some on Thursday and Monday night too. I'll drink bier with anyone arriving early or staying late. - 81 EUR for 2 nights - you have to send an email to the address on the web page to reserve a room, note the "keyword" - first come, first served, reservations must be made by March 29th - did I mention RSVP'ing on WineHQ as well? Link: http://www.winehq.com/site/wineconf/rsvp Thanks goes out to Hans-Ulrich Schmid (WRS) and Ulrich Gemkow (University of Stuttgart) for getting together and figuring this out. -Brian

1 0

where does windows define RTL_RWLOCK?
by Robert Reif Jan. 23, 2005

Jan. 23, 2005

I'm trying to compile wine's direct sound dll on windows and I can't get past this problem. I can't find a windows file that defines RTL_RWLOCK in the PSDK or DDK. Is the structure wine uses compatible with windows?

2 1

Re: [DSOUND] fix memory leak in mixer code
by Robert Reif Jan. 22, 2005

Jan. 22, 2005

Robert Reif wrote: > Fix memory leak in mixer code. > > > Revised to remove unnecessary test before HeapFree. Index: dlls/dsound/dsound.c =================================================================== RCS file: /home/wine/wine/dlls/dsound/dsound.c,v retrieving revision 1.24 diff -u -p -r1.24 dsound.c --- dlls/dsound/dsound.c 7 Dec 2004 14:23:46 -0000 1.24 +++ dlls/dsound/dsound.c 22 Jan 2005 20:52:27 -0000 @@ -301,6 +301,7 @@ static ULONG WINAPI IDirectSoundImpl_Rel if (This->driver) IDsDriver_Release(This->driver); + HeapFree(GetProcessHeap(),0,This->tmp_buffer); RtlDeleteResource(&This->buffer_list_lock); This->mixlock.DebugInfo->Spare[1] = 0; DeleteCriticalSection(&This->mixlock); @@ -809,6 +810,8 @@ HRESULT WINAPI IDirectSoundImpl_Create( pDS->primary = NULL; pDS->speaker_config = DSSPEAKER_STEREO | (DSSPEAKER_GEOMETRY_NARROW << 16); pDS->initialized = FALSE; + pDS->tmp_buffer = NULL; + pDS->tmp_buffer_len = 0; /* 3D listener initial parameters */ pDS->listener = NULL; Index: dlls/dsound/dsound_private.h =================================================================== RCS file: /home/wine/wine/dlls/dsound/dsound_private.h,v retrieving revision 1.24 diff -u -p -r1.24 dsound_private.h --- dlls/dsound/dsound_private.h 7 Sep 2004 19:32:21 -0000 1.24 +++ dlls/dsound/dsound_private.h 22 Jan 2005 20:52:27 -0000 @@ -95,6 +95,8 @@ struct IDirectSoundImpl DSBUFFERDESC dsbd; DWORD speaker_config; BOOL initialized; + LPBYTE tmp_buffer; + DWORD tmp_buffer_len; /* DirectSound3DListener fields */ IDirectSound3DListenerImpl* listener; Index: dlls/dsound/mixer.c =================================================================== RCS file: /home/wine/wine/dlls/dsound/mixer.c,v retrieving revision 1.26 diff -u -p -r1.26 mixer.c --- dlls/dsound/mixer.c 8 Sep 2004 01:37:25 -0000 1.26 +++ dlls/dsound/mixer.c 22 Jan 2005 20:52:27 -0000 @@ -368,20 +368,20 @@ static void DSOUND_MixerVol(IDirectSound } } -static void *tmp_buffer; -static size_t tmp_buffer_len = 0; - -static void *DSOUND_tmpbuffer(size_t len) +static LPBYTE DSOUND_tmpbuffer(IDirectSoundImpl *dsound, DWORD len) { - if (len>tmp_buffer_len) { - void *new_buffer = realloc(tmp_buffer, len); - if (new_buffer) { - tmp_buffer = new_buffer; - tmp_buffer_len = len; + TRACE("(%p,%ld)\n",dsound,len); + + if (len > dsound->tmp_buffer_len) { + if (dsound->tmp_buffer) + dsound->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsound->tmp_buffer, len); + else + dsound->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, len); + + dsound->tmp_buffer_len = len; } - return new_buffer; - } - return tmp_buffer; + + return dsound->tmp_buffer; } static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD fraglen) @@ -407,9 +407,7 @@ static DWORD DSOUND_MixInBuffer(IDirectS return 0; } - /* Been seeing segfaults in malloc() for some reason... */ - TRACE("allocating buffer (size = %d)\n", len); - if ((buf = ibuf = (BYTE *) DSOUND_tmpbuffer(len)) == NULL) + if ((buf = ibuf = DSOUND_tmpbuffer(dsb->dsound, len)) == NULL) return 0; TRACE("MixInBuffer (%p) len = %d, dest = %ld\n", dsb, len, writepos); @@ -518,8 +516,7 @@ static void DSOUND_PhaseCancel(IDirectSo nBlockAlign = dsb->dsound->pwfx->nBlockAlign; len = len / nBlockAlign * nBlockAlign; /* data alignment */ - TRACE("allocating buffer (size = %ld)\n", len); - if ((buf = ibuf = (BYTE *) DSOUND_tmpbuffer(len)) == NULL) + if ((buf = ibuf = DSOUND_tmpbuffer(dsb->dsound, len)) == NULL) return; TRACE("PhaseCancel (%p) len = %ld, dest = %ld\n", dsb, len, writepos);

1 0

Re: [DSOUND] fix memory leak in mixer code
by Mike Hearn Jan. 22, 2005

Jan. 22, 2005

On Sat, 22 Jan 2005 14:46:04 -0500, Robert Reif wrote: > + if (This->tmp_buffer) > + HeapFree(GetProcessHeap(),0,This->tmp_buffer); There's no need for the test here, it's duplicated inside HeapFree. There was a janitorial task to clean this up not that long ago. thanks -mike

1 0

Howto process X11 events async'ly
by Peter Quiring Jan. 22, 2005

Jan. 22, 2005

I'm developing my own library and I'm in the process of porting it over in Linux. I can get X11 to display the graphics and process events, but the only problem I have is with processing events without wasting CPU power. How do you process events without constantly polling? What I've done is create a new thread that will call XNextEvent() which will block if there are no events waiting and this seems to work fine. Except if the main thread wants to use the Window it too will deadlock until XNextEvent() returns an event. I've even tried using XPutBackEvent() to wake-up the other thread, but it looks like X11 is not smart enough to handle this. Looking at Wine source it looks like they too have given up on X11 and do sync themselves. But then how do you know when new events are waiting without constantly polling ????? I've looked thru wine source but can't follow it. Thanks in advance. I've asked this question many times @ linuxforum.com but no one there understands the problem. Peter Quiring

3 2

Wine/Winelib for Visual Basic 6.0 Users?
by Ira Krakow Jan. 22, 2005

Jan. 22, 2005

I'm writing the Winelib part of the book. The main audience is Microsoft Visual C++ 6.0 users. I can define a development environment for both MFC and non-MFC users, since it is well documented already. I was wondering - I'd like to include a section for Visual Basic 6.0 users. Beyond running the .EXEs in Wine, is it possible to use Winelib to convert VB6.0 apps? How does it differ from the VC++ environment? There's a _lot_ of VB6 code out there. Attracting these developers will help the Wine project (and sales of our book) tremendously. Thanks for your input. Ira

3 2

Re: [d3drm] Adds a header, and corrects a typo
by Tom Jan. 22, 2005

Jan. 22, 2005

Ivan Leo Puoti wrote: > Peter Berg Larsen wrote: > >> + * Copyright (C) the Wine project > > > Please use your own name here, Wine is not a legal entity and cat' own > copyright, > just as it can't own a building or a car, so this copyright notice > doesn't make much sense. > If you don't want to use your name use something like "The wine project > authors" Why not just - the line you don't have to give copyright notice if you don't want to. Tom > > Ivan. > > > >

3 2

Updating my address book
by Dustin Jan. 22, 2005

Jan. 22, 2005

Hi I am updating my address book and it would be very helpful if you could click on the link below and enter your contact details for me: http://www.bebo.com/fr2/979448a934523b19214292c927616713d18 I am using a service that keeps contact details current, just update your own contact details and then the changes appear in selected friends address books. When I update my contact details you will see them in your address book. Thank you for helping. Dustin

1 0

cleanup shlfileop.c
by Joris Huizer Jan. 22, 2005

Jan. 22, 2005

Changelog: - use retCode smarter (undoing a few bits of myself) - add file_operation_invalid_handle(), file_operation_on_data(), file_operation_invalid_attr() instead of inline code I put back the line the discussion was about - I thought about it and I probably was not thinking the right way; If there are still problems, please let me know Sending here now as it wasn't applied: is there a problem with it or should I just re-submit ? regards, Joris ? .shlfile.diff.swp ? description-pak ? doc-pak ? shlfile.diff ? thisref.sh ? versions ? wine-current.deb ? wine-working.deb ? dlls/shell32/shlfileop.jh.0.c ? dlls/shell32/shlfileop.jh.c Index: dlls/shell32/shlfileop.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/shlfileop.c,v retrieving revision 1.51 diff -u -p -r1.51 shlfileop.c --- dlls/shell32/shlfileop.c 14 Jan 2005 16:51:14 -0000 1.51 +++ dlls/shell32/shlfileop.c 22 Jan 2005 11:37:59 -0000 @@ -945,6 +945,65 @@ static int file_operation_checkFlags(SHF return 0; } +static int file_operation_invalid_handle(long FuncSwitch, LPWSTR pFromFile, DWORD ToPathAttr, LPWSTR pTempFrom) +{ + BOOL b_Mask = (NULL != StrPBrkW(&pFromFile[1], wWildcardChars)); + if ((FO_DELETE == FuncSwitch) && (b_Mask)) + { + DWORD FromPathAttr; + pFromFile[0] = '\0'; + FromPathAttr = GetFileAttributesW(pTempFrom); + pFromFile[0] = '\\'; + if (IsAttribDir(FromPathAttr)) + { + /* FO_DELETE with mask and without found is valid */ + return 0; + } + } + /* root (without mask) is also not allowed as source, tested in W98 */ + return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; +} + +static int file_operation_on_data(WIN32_FIND_DATAW *wfd,SHFILEOPSTRUCTW *nFileOp, LPWSTR pFromFile,LPWSTR pToFile) +{ + LPWSTR lpFileName = wfd->cAlternateFileName; + if (!lpFileName[0]) + lpFileName = wfd->cFileName; + if (IsDotDir(lpFileName) || + (IsAttribDir(wfd->dwFileAttributes) && (nFileOp->fFlags & FOF_FILESONLY))) + return 0; /* next name in pTempFrom(dir) */ + SHFileStrCpyCatW(&pToFile[1], lpFileName, NULL); + SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); + return SHFileOperationW (nFileOp); +} + +static int file_operation_invalid_attr(LPWSTR pToFile,LPWSTR pTempTo, BOOL b_ToValid) +{ + DWORD ToPathAttr; + BOOL b_ToInvalidTail; + if (pToFile) + { + b_ToInvalidTail = (NULL != StrPBrkW(&pToFile[1], wWildcardChars)); + pToFile[0] = '\0'; + ToPathAttr = GetFileAttributesW(pTempTo); + if ((ToPathAttr == INVALID_FILE_ATTRIBUTES) && b_ToValid) + { + /* create dir must be here, sample target D:\y\ *.* create with RC=10003 */ + if (SHNotifyCreateDirectoryW(pTempTo, NULL)) + { + return 0x73;/* value unknown */ + } + ToPathAttr = GetFileAttributesW(pTempTo); + } + pToFile[0] = '\\'; + if (b_ToInvalidTail) + { + return 0x10003; + } + } + return 0; +} + /************************************************************************* * SHFileOperationW [SHELL32.@] * @@ -964,7 +1023,6 @@ int WINAPI SHFileOperationW(LPSHFILEOPST LPWSTR pTempTo = NULL; LPWSTR pFromFile; LPWSTR pToFile = NULL; - LPWSTR lpFileName; int retCode = 0; DWORD ToAttr; DWORD ToPathAttr; @@ -986,8 +1044,6 @@ int WINAPI SHFileOperationW(LPSHFILEOPST long FuncSwitch = (nFileOp.wFunc & FO_MASK); long level= nFileOp.wFunc>>4; - int ret; - /* default no error */ nFileOp.fAnyOperationsAborted = FALSE; @@ -1016,10 +1072,9 @@ int WINAPI SHFileOperationW(LPSHFILEOPST * create dir 0 0 0 0 0 0 1 0 */ - ret = file_operation_checkFlags(nFileOp); - if (ret != 0) + retCode = file_operation_checkFlags(nFileOp); + if (retCode) { - retCode = ret; goto shfileop_end; } @@ -1108,20 +1163,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPST hFind = FindFirstFileW(pFrom, &wfd); if (INVALID_HANDLE_VALUE == hFind) { - if ((FO_DELETE == FuncSwitch) && (b_Mask)) - { - DWORD FromPathAttr; - pFromFile[0] = '\0'; - FromPathAttr = GetFileAttributesW(pTempFrom); - pFromFile[0] = '\\'; - if (IsAttribDir(FromPathAttr)) - { - /* FO_DELETE with mask and without found is valid */ - goto shfileop_end; - } - } - /* root (without mask) is also not allowed as source, tested in W98 */ - retCode = ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; + retCode = file_operation_invalid_handle(FuncSwitch,pFromFile,ToPathAttr,pTempFrom); goto shfileop_end; } @@ -1130,13 +1172,8 @@ int WINAPI SHFileOperationW(LPSHFILEOPST /* ??? b_Mask = (!SHFileStrICmpA(&pFromFile[1], &wfd.cFileName[0], HIGH_ADR, HIGH_ADR)); */ if (!pTo) /* FO_DELETE */ { - ret = file_operation_delete(&wfd,nFileOp,pFromFile,pTempFrom,&hFind); - /* if ret is not 0, nFileOp.fAnyOperationsAborted is TRUE */ - if (ret != 0) - { - retCode = ret; - goto shfileop_end; - } + retCode = file_operation_delete(&wfd,nFileOp,pFromFile,pTempFrom,&hFind); + /* if retCode is not 0, nFileOp.fAnyOperationsAborted is TRUE and while loop will end */ continue; } /* FO_DELETE ends, pTo must be always valid from here */ @@ -1202,15 +1239,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPST nFileOp.fFlags = (nFileOp.fFlags | FOF_MULTIDESTFILES); do { - lpFileName = wfd.cAlternateFileName; - if (!lpFileName[0]) - lpFileName = wfd.cFileName; - if (IsDotDir(lpFileName) || - (IsAttribDir(wfd.dwFileAttributes) && (nFileOp.fFlags & FOF_FILESONLY))) - continue; /* next name in pTempFrom(dir) */ - SHFileStrCpyCatW(&pToFile[1], lpFileName, NULL); - SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); - retCode = SHFileOperationW (&nFileOp); + retCode = file_operation_on_data(&wfd,&nFileOp,pFromFile,pToFile); } while(!nFileOp.fAnyOperationsAborted && FindNextFileW(hFind, &wfd)); } FindClose(hFind); @@ -1222,27 +1251,9 @@ int WINAPI SHFileOperationW(LPSHFILEOPST /* only FO_COPY/FO_MOVE without mask, all others are (must be) solved */ if (IsAttribDir(wfd.dwFileAttributes) && (ToAttr == INVALID_FILE_ATTRIBUTES)) { - if (pToFile) - { - pToFile[0] = '\0'; - ToPathAttr = GetFileAttributesW(pTempTo); - if ((ToPathAttr == INVALID_FILE_ATTRIBUTES) && b_ToValid) - { - /* create dir must be here, sample target D:\y\ *.* create with RC=10003 */ - if (SHNotifyCreateDirectoryW(pTempTo, NULL)) - { - retCode = 0x73;/* value unknown */ - goto shfileop_end; - } - ToPathAttr = GetFileAttributesW(pTempTo); - } - pToFile[0] = '\\'; - if (b_ToInvalidTail) - { - retCode = 0x10003; - goto shfileop_end; - } - } + retCode = file_operation_invalid_attr(pToFile,pTempTo,b_ToValid); + if (retCode) + goto shfileop_end; } /* trailing BackSlash is ever removed and pToFile points to BackSlash before */

1 0

Re: janitorial: COM status update
by Tom Jan. 22, 2005

Jan. 22, 2005

James Hawkins wrote: > Hi, > > Changelog > * update the status of the COM janitorial projects > > -- > James Hawkins > > Index: templates/en/janitorial.template > =================================================================== > RCS file: /home/wine/lostwages/templates/en/janitorial.template,v > retrieving revision 1.64 > diff -u -r1.64 janitorial.template > --- templates/en/janitorial.template 19 Jan 2005 16:54:31 -0000 1.64 > +++ templates/en/janitorial.template 21 Jan 2005 23:04:11 -0000 > @@ -70,28 +70,10 @@ > <li>avifil32 : 7 files to check > <li>d3d8 : 12 files to check > <li>d3d9 : 17 files to check > - <li>d3dx8 : 1 files to check > - <li>d3dxof : 1 files to check > - <li>dmband : 3 files to check > - <li class=submitted>dmcompos : 4 files checked I beleive this is the way it should be done (class=submitted) instead of removing completed entries. Tom

2 2

spam
by Tom Jan. 21, 2005

Jan. 21, 2005

Unofficial guide for running eXeem under Linux! http://exeem-linux.solaris.name/index.php And Wine is used ofcourse. Tom

1 0

Oracle - unixODBC - wine - Win32 ODBC Apple
by Martin HEIN Jan. 21, 2005

Jan. 21, 2005

Hi folks, I'm trying to connect some of our proprietory corporate Windows-based applictions via ODBC to our Oracle database by following as stated in the Wine User's Guide, Using ODBC, but it's to no avail! :( I have setup * Oracle 10g Instant Client for Linux 10.1.0.3 (/usr/local/oracle/10.1.0.3) * unixODBC 2.2.10 (/usr/local) * Oracle ODBC driver 0.5.4 (/usr) * CodeWeavers CrossOver Office 4.1 (/appl/os/CrossOver/cxoffice) My environment looks like * ORACLE_BASE=/usr/local/oracle * ORACLE_VER=10.1.0.3 * ORACLE_HOME=$ORACLE_BASE/$ORACLE_VER * TNS_ADMIN=$ORACLE_HOME/etc * LIB_ODBC_DRIVER_MANAGER=/usr/local/lib/libodbc.so My configuration files are located under * tnsnames.ora: $ORACLE_HOME/etc * odbcinst.ini: /usr/local/etc * odbc.ini: /usr/local/etc Using 'sqlplus' (Oracle; SQL*Net) or 'isql' (unixODBC; ODBC) to connect from the Unix command line to one of the configured databases works perfectly fine! But unfortunately I can't get unixODBC and wine working together! :( Cheers, Martin -------------------------------------------------- T-Mobile Austria GmbH Ing.Martin HEIN Information Technologies / Services Knowledge Management & Process Automation / Senior Manager Rennweg 97-99 A-1030 Vienna Fon: +43-1-79585-6337 Fax: +43-1-79585-6584 Mobile: +43-676-82006337 E-Mail: Martin.HEIN(a)T-Mobile.at Web: http://www.T-Mobile.at -------------------------------------------------- NOTICE AND DISCLAIMER: This email (including attachments) is confidential. If you have received this email in error please notify the sender immediately and delete this email from your system without copying or disseminating it or placing any reliance upon its contents. --------------------------------------------------

3 2