October 2002 - Wine-Devel - list.winehq.org

Re: Treeview fix
by Jeff Smith Oct. 23, 2002

Oct. 23, 2002

This patch did the trick. Well I cannot test it at the moment, but as the value INT_MAX (0x7fffffff) was the issue, I know this will fix it. The limit works a lot better (is a lot safer) than the 'special' value. ... - if (i == 0x7fff) + if (i >= 0x7fff) i = hdpa->nItemCount; ... >From: "Dimitrie O. Paun" <dpaun(a)rogers.com> > >On October 23, 2002 01:29 am, Jeff Smith wrote: > > Oops, your previous message got lost in the shuffle... > > I'm sure anything is better than the little patch I wrote. > > I was just taking a minimalist approach to get treeview working. > >No, your patch was quite good. Would have certainly fixed the treeview, >but I think apps depend on the extended behavior. Does my patch fix >the problems you were experiencing? > >-- >Dimi. _________________________________________________________________ Broadband? Dial-up? Get reliable MSN Internet Access. http://resourcecenter.msn.com/access/plans/default.asp

1 0

Re: Treeview fix
by Jeff Smith Oct. 23, 2002

Oct. 23, 2002

Oops, your previous message got lost in the shuffle... I'm sure anything is better than the little patch I wrote. I was just taking a minimalist approach to get treeview working. -- Jeff S Dimi wrote: >On October 23, 2002 12:44 am, Jeff Smith wrote: > > I discovered treeview uses DSA's and Dimi recently > > changed the max element number in DSA's to 0x7fff (SHRT_MAX). > > Note this value has the special meaning in DSA_InsertPtr > > functions of 'add new element to end of array'. > >This was my initial reaction to this thing, as well. But I >think my fix (sent earlier with Subject DPA_InsertPtr) is >better. Please try it out -- it should fix your problem. > >BTW, I've also audited all other uses of DPA_InsertPtr, >and they are fine. We should be back to normal now (well, >after my patch is applied, of course). > >-- >Dimi. _________________________________________________________________ Surf the Web without missing calls! Get MSN Broadband. http://resourcecenter.msn.com/access/plans/freeactivation.asp

2 1

LogonUser(), netapi work
by Martin Wilck Oct. 23, 2002

Oct. 23, 2002

Hi, after having been busy with other stuff for a while, I'd like to inquire the status of my LogonUser() patch (http://www.winehq.com/hypermail/wine-devel/2002/09/0448.html) I have had almost no feedback, positive or negative, on this, and it wasn't applied either. I still think it could be useful, although it is clear that wine won't (shouldn't) be able to change personality in the foreseeable future. Andriy, what is the status of your netapi work? Martin -- Martin Wilck Phone: +49 5251 8 15113 Fujitsu Siemens Computers Fax: +49 5251 8 20409 Heinz-Nixdorf-Ring 1 mailto:Martin.Wilck(a)Fujitsu-Siemens.com D-33106 Paderborn http://www.fujitsu-siemens.com/primergy

2 1

Re: Using winbind with Wine
by Martin Wilck Oct. 23, 2002

Oct. 23, 2002

Am Mit, 2002-09-25 um 00.55 schrieb Andrew Bartlett: > Firstly, it's good to see that winbind is starting to get some interest > :-) I have been ignoring it so far, but in the context of the current inquiries I tried it out and was impressed :-) > Secondly, don't fall into the trap squid (with my encouragement I might > add...) fell into - don't use the winbind pipe directly. The winbind > API is an internal Samba API, and can change without warning. Hmm - what other APIs are there? The only libraries that are accessible are nss_winbind and pam_winbind. Those two already carry us a long way, BUT ... I started thinking about other options when I found the "wbinfo -n" call. AFAIK there is no way to obtain equivalent info through PAM/NSS, simply because these APIs have no concept of a SID. Obviously apart from the SID there is a lot more information to gather from a PDC. I have not digged deeply enough into this to be able to enumerate everything, but think of the different GetUserInfo() calls on NT. libsmbclient can't be used by wine because it's GPL. And even if we could use it, it's headers only define calls related to shares and printing, which is not what I'm currently aiming at. > As to unicode, I > have designated one call as being in utf8, to cope with external > interaction, so it's possible things can happen here. What matters to wine is that if a call goes like this: Windows app <-> wine <-> PAM or other API <-> winbind <-> RPC <-> Windows server, we must ensure that the Unicode string wine receives from the app reaches the server ungarbled. Martin -- Martin Wilck Phone: +49 5251 8 15113 Fujitsu Siemens Computers Fax: +49 5251 8 20409 Heinz-Nixdorf-Ring 1 mailto:Martin.Wilck(a)Fujitsu-Siemens.com D-33106 Paderborn http://www.fujitsu-siemens.com/primergy

8 12

Marshalling code for me to use?
by Greg Turner Oct. 23, 2002

Oct. 23, 2002

Before I go off and duplicate a bunch of work somebody already did, I wanted to verify that wine has no existing implementation of NDR data marshalling? I don't know of such a thing, but I don't necessarily have the big picture. rpcrt4 needs this for somewhat obvious reasons, and the format is well documented by OpenGroup if we need to start an implementation from scratch. -- gmt

4 8

another snapshot (F_PL1_pre1)
by Greg Turner Oct. 23, 2002

Oct. 23, 2002

relative to yesterday's RPC_E_PL15_unmerged.diff. LICENSE: X11 CHANGELOG: * dlls/rpcrt4: ndr_marshall.c, ndr_midl.c, ndr_misc.h, rpcrt4_main.c, ndr_stubless.c; include: rpcndr.h, wine/rpcfc.h: Greg Turner <gmturner007(a)ameritech.net> - make explicit some hidden include dependencies - Implement NdrGetBuffer, NdrFreeBuffer, NdrConformantStringBufferSize and NdrConformantStringMarshall - define the RPC_FC_C_CSTRING constant - perhaps I don't want those MIDL_*_FORMAT_STRING structs, after all. removed. - add todo list - MIDL_STUB_MESSAGE.uFlags aren't. - comment out the NdrClientCall2 mock-up since some of that stuff is in the process of being implemented. -- gmt "Oh, and of course, the fastest way to dig a tunnel is to dig at both sides." -- The Linux Advanced Routing HOWTO

1 0

Treeview fix
by Jeff Smith Oct. 23, 2002

Oct. 23, 2002

Intro: Once I got wine to finally execute the native regedit, treeview was bringing it down. Background: I discovered treeview uses DSA's and Dimi recently changed the max element number in DSA's to 0x7fff (SHRT_MAX). Note this value has the special meaning in DSA_InsertPtr functions of 'add new element to end of array'. Problem: INT_MAX (0x7fffffff) was being passed from treeview to DSA_InsertPtr. This caused failure returns and eventually a seg fault. Conclusion: This patch fixes the problem (according to the style of other calls to DSA_InsertPtr), and native regedit now works. Questions for further thought: I wonder, should 0x7fff be used explicitly, or should SHRT_MAX be used in places like this instead? Changelog: Treeview fix due to change in maximum DSA size. -- Jeff S. Index: dlls/comctl32/treeview.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/treeview.c,v retrieving revision 1.103 diff -u -r1.103 treeview.c --- dlls/comctl32/treeview.c 6 Sep 2002 19:41:18 -0000 1.103 +++ dlls/comctl32/treeview.c 23 Oct 2002 04:12:53 -0000 @@ -949,7 +949,7 @@ if (!newItem) return NULL; - if (DPA_InsertPtr(infoPtr->items, INT_MAX, newItem) == -1) + if (DPA_InsertPtr(infoPtr->items, 0x7fff, newItem) == -1) { COMCTL32_Free(newItem); return NULL; @@ -2885,7 +2885,7 @@ for (child = item->firstChild; child != NULL; child = child->nextSibling) { - if (DPA_InsertPtr(list, INT_MAX, child) == -1) + if (DPA_InsertPtr(list, 0x7fff, child) == -1) { DPA_Destroy(list); return NULL; _________________________________________________________________ Get faster connections -- switch to MSN Internet Access! http://resourcecenter.msn.com/access/plans/default.asp

2 1

Re: using native regedit
by Jeff Smith Oct. 23, 2002

Oct. 23, 2002

I agree that the example should be changed to indicate a 'valid' entry if this is the way it is supposed to be. This would have saved me a lot of trouble and confusion. Now I can work on getting native regedit working again. -- Jeff S. >Shouldn't we update the sample entry in documentation/sample/config ? > > ; you can specify applications too >-"*\\notepad.exe" = "native, builtin" >+"notepad.exe" = "native, builtin" > ; default for all other dlls > "*" = "builtin, native" > > > It's the way it's supposed to work, because it mimics the way > > loadorder works for dlls: a simple "regedit.exe" matches only if > > regedit is in the system directory. Otherwise you need to specify the > > full path, or use a wildcard entry like "*regedit.exe". > > > > -- > > Alexandre Julliard > > julliard(a)winehq.com _________________________________________________________________ Protect your PC - get McAfee.com VirusScan Online http://clinic.mcafee.com/clinic/ibuy/campaign.asp?cid=3963

2 1

Re: using native regedit
by Jeff Smith Oct. 23, 2002

Oct. 23, 2002

Found something: it works if I fully qualify the command name. I was trying this in the DllOverrides / command-line respectively: "regedit.exe" = "native, builtin" --dll regedit.exe=n,b What I have to do for it to work is this: "C:\\Windows\\regedit.exe" = "native, builtin" --dll C:\\Windows\\regedit.exe=n,b I still do not think this is *exactly* as it should be, but I'm finally on the track to figuring it out. -- Jeff S. _________________________________________________________________ Broadband? Dial-up? Get reliable MSN Internet Access. http://resourcecenter.msn.com/access/plans/default.asp

3 2

[RFC] Adding an include/wine/wine directory?
by Patrik Stridvall Oct. 23, 2002

Oct. 23, 2002

As some of you probably know I have been working on compiling Wine on Windows using Microsoft Visual C/C++ (MSVC). Even though it doesn't really work that well yet there have been at least some success. Anyway recently I have began trying to get the Wine tests to compile and work using MSVC. More specifically I have been trying to get the my generated tests for data structure packing (tests/generated.c) to work. This currently works quite well. A few patches regarding errors found coming soon. However there are at least two intresting ways to compile and run the tests on Windows. 1. Compile using the Wine headers. 2. Compile using the Microsoft headers. Currently only (1) works in a portable way. To get (2) to work I had to add the directory of the Microsoft includes to the begining of the include path. This is not very portable since it differs from installation to installation. I have currently hardcoding my specific directory. The above have to be done because the Wine tests includes include/wine/test.h as thus ..\..\..\include (or similar depending on directory depth have to be added the the include). This overides the Microsoft headers!!! Microsoft C unlike GNU C have no option to avoid this other than adding the path the Microsoft include directory which as I previously mention varies depend on installation. :-) However I finally think I have found a portable solution, that will work not only with the Wine test but also with Wine itself (eventhough that is perhaps less instresting right now). We currently have the directory structure like include: Wine's version of Windows headers include/wine: Wine's internal and "extension" headers I would like to have a directory structure like include: Wine's version of Windows headers include/wine: Wine's internal headers include/wine/wine: Wine's "extension" headers With "extension" headers I mean that headers that are exported and usuable by Winelib applications. This would allow me to, using MSVC, just do /I ..\..\..\include\wine instead of the current very ugly and unportable /I d:\program files\microsoft visual studio\vc98\include /I ..\..\..\include So concretely what I think needs to be done (not tested) is the following. cd include/wine mkdir wine mv exception.h test.h unicode.h wine # Then include/Makefile.in needs to be changed accordingly as well. # In principle all the include/wine/ files named in include/Makefile.in # should be moved as well. However the files named above is enough for # the Wine tests AFAICS. --- Make.rules.in 19 Oct 2002 17:15:00 -0000 1.131 +++ Make.rules.in 21 Oct 2002 12:58:35 -0000 @@ -45,7 +45,7 @@ LN = @LN@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ -DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) +DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include -I$(TOPSRCDIR)/include/wine $(EXTRAINCL) ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) LD = @LD@ LDFLAGS = @LDFLAGS@ So what do you think? Note that compiling Winelib applications under Linux might benefit from this as well since it makes it easier to use the real Microsoft headers together the Wine extensions (wine/*.h). Sure currently GNU C chokes on this but one day some compiler (GNU C or some other) might not...

3 2

RE: [RFC] Adding an include/wine/wine directory?
by Patrik Stridvall Oct. 22, 2002

Oct. 22, 2002

> Patrik Stridvall <ps(a)leissner.se> writes: > > > We could do that following instead: > > (1) /usr/include/wine => /usr/include/wine/windows > > (2) /usr/include/wine/wine => /usr/include/wine/windows/wine > > (3) /usr/include/wine/wine/wine => /usr/include/wine > > > > Also note (2) will disappear eventually. > > Well, it's somewhat better, but it's still too complex IMO. Where is the complexity? If you want to port a Window application, you add -I/usr/include/wine/windows and everything as much as like under Windows as possible. If you in addition wish to call some Wine "extension" no problem just do #include "wine/foo.h" or similar. If you just want to use the Windows API in an Unix application you need anything at all. Just do #include "wine/windows/wincrypt.h" and you're done. [Linking is a separate problem, of course. But then, this changes nothing as far as this is concerned] > Maybe what > we should do is put the (3) headers directly in /usr/include, like > /usr/include/wine_unicode.h. But this would work only if we don't have > many of them, so we probably want to work on simplifying this first. I can't see any principal difference between /usr/include/wine_foo.h or /usr/include/wine/foo.h None of them requires any -I. It is more a convention that if you have many .h you have a directory, if not, well then you can have a directory anyway, it is up to you. > Also note that this is not going to solve your problem, because > wine/test.h is more a category (2) header Well wine/test.h is really kind of a special case anyway it could be moved to programs/winetest/include/wine or something under whatever name it is not really a concern. Perhaps we should move programs/winetest/wtmain.c to test/ and make it a library similar to library/ and unicode/. This is what I did with MSVC, eventhough I did it in programs/winetest instead. > (or maybe you need a new > category for Wine internal headers that don't get installed). You mean for files like windef16.h? Well, in the long run such files really belongs in the dlls/* directories. In the extent that that can't they really are Wine "extension" that might as well be used by any Winelib application not just internally should IMHO be installed. But yes, we certainly need some place to put them in the meantime, since this isn't happing over night. However I think that they can remain in include/wine/ until we move them one by one. See below. > > PS. Of course we could move include/*.h to include/wine/windows or > > something like that but then it is no real use and beside it ruins > > the cvs patch log. Better stick to the ugly include/wine/wine > > solution interally IMHO. > > Not an option. If we have to move the files we'll move them; it's > better to avoid moving things around too much. but we shouldn't let > CVS limitations impose a broken structure. OK. > Now if we can find a non > broken structure that also doesn't involve moving files that's better. Perhaps this would work: mkdir library/wine mv include/wine/{library,port}.h library/wine mkdir unicode/wine mv include/wine/unicode.h unicode/wine mkdir dlls/ntdll/wine mv include/wine/exception.h dlls/ntdll/wine Sure it would mean a few more -I internally but it would not be that bad. Then during install all these files as well as some files from include/wine/ ends up in /usr/include/wine and the include/ files end up in /usr/include/wine/windows or /usr/include/wine/win32 not sure what is best. That would require moving a minimum of files. As before eventually far in the future include/wine/ would be empty. Transition done. We needn't move everything right now either. As mentioned before running the Wine test with the Microsoft headers currently AFAICS only requires that we fix wine/{exception,test,unicode}.h. Of course compiling every DLL with the Microsoft headers requires fixing all of include/wine/ but then as long as we have a solution when we get where eventually is good enough IMHO, doing that is no particular rush. Having the Wine tests work properly sooner rather than later is much more important though.

3 2

using native regedit
by Jeff Smith Oct. 22, 2002

Oct. 22, 2002

3 2

Re: updated dlls/comctl32/commctrl.c comments
by Dimitrie O. Paun Oct. 22, 2002

Oct. 22, 2002

On October 22, 2002 03:02 pm, Christian Neumair wrote: > Dimitrie started posting a header doc patch for listview.c, so I got > motivated and wrote the same thing for commctrl.c. > I hope it's complete. Thanks, Chris. In many respects, this is more important than code. For many reasons I will not go into here, I think it is vital that we have a header giving a _clear_ pictures of what remains to be done. I just hope others will do the same. -- Dimi.

1 0

Re: Don't return FILE_ATTRIBUTE_SYMLINK
by Dimitrie O. Paun Oct. 22, 2002

Oct. 22, 2002

On October 22, 2002 04:25 pm, Medland, Bill wrote: > diff105.diff Can you please insert such files in the body of the message? It gets combersome to review patches in attachments... -- Dimi.

1 0

RE: [RFC] Adding an include/wine/wine directory?
by Patrik Stridvall Oct. 22, 2002

Oct. 22, 2002

> Patrik Stridvall <ps(a)leissner.se> writes: > > > I suggest that we gradually move the files in include/wine > > to include/wine/wine or in some cases other places like the DLL > > directories. Eventually, far in the future, the > include/wine directory > > will be empty (save for a wine directory). > > > > This provides a slow and steady migration path from the old > > to the new that doesn't have any of the problems you described. > > What more can you ask for? > > A clean solution? Seriously this is ugly as hell; It would have been nice if had been cleaner yes, but then you can't have everything can you? :-) Seriously, I think we can do a little better. See below. > especially when you > consider that after you install you will get Wine headers in > /usr/include/wine, /usr/include/wine/wine and > /usr/include/wine/wine/wine. Correct. [I think we understand each other at least this time] > Tell me this isn't confusing... First of all you have /usr/include/wine and /usr/include/wine/wine even today. Which already is a little confusing. But hey it works for most thing so I'm not complaining that much. But yes, it is a little confusing. Hmm. Thinking.... We could do that following instead: (1) /usr/include/wine => /usr/include/wine/windows (2) /usr/include/wine/wine => /usr/include/wine/windows/wine (3) /usr/include/wine/wine/wine => /usr/include/wine Also note (2) will disappear eventually. This would be very nice since now normal Winelib applications ie ports from Windows can do -I/usr/include/wine/windows regardless of whether they use the Wine "extensions" or not since #include "wine/test.h" for example will work without a -I. "Special" Winelib application could do #include "wine/windows/wincrypt.h" without any -I if somebody for example wanted to use the Windows encryption API in a normal Unix application. Hmm. Perhaps /usr/include/wine/windows should be /usr/include/wine/win32 instead, with perhaps /usr/include/wine/windows as symbolic link to /usr/include/wine/win32. But that is just details, what do you think in principle. > If you really want to make it possible to mix and match headers from > different sources, you need a more serious redesign of the whole > include layout, and you need to ensure that the normal case is at > least as easy and clean as it is today. I think the suggestion above would do nicely. Internally in the wine tree I think we might have to choose the ugly include/wine/wine solution, but we could install to the solution above which is what's really important. PS. Of course we could move include/*.h to include/wine/windows or something like that but then it is no real use and beside it ruins the cvs patch log. Better stick to the ugly include/wine/wine solution interally IMHO.

2 1

An RPC progress report
by Greg Turner Oct. 22, 2002

Oct. 22, 2002

On Tuesday 22 October 2002 12:47 pm, you wrote: > Greg - > > I've been following the RPC merges lately, > looks like a lot of stuff added. I browsed > the code, but I couldn't really get a grasp > on some of it. That's OK, I'm not sure /I've/ got a grasp on some of it !! ;) > I was just wondering if > you'd like to write an update (short, long, > whatever) about what you've done, what's left > to do, major stumbling blocks, etc. I'll > include it in the next issue of Wine Weekly > News. Above what Ove already implemented, I really haven't done all that much. Frankly, in its current state, it is quite possible that the RPC work I am doing will /detract/ from the stability of wine, until the implementation is more complete. RPC is painfully complicated, and a victim of serious creeping featurism. Microsoft makes it worse by providing poorly documented extentions to the protocol, and a largely undocumented marshalling API (much of which developers typically don't have to learn because the API calls are generated by the MIDL compiler). My target right now is to get a "hello world" API invocation to work across processes using wine RPC. Once that is achieved, I plan to create a unit test for this. Then, we'll have a framework that we can begin to extend and implement "properly." I am not there yet, but I think I'm getting close. I just have to implement marshalling for strings, which, in theory, looks pretty easy. There are probably many bugs that need squashing before it works, and maybe some additional gaps in functionality that I don't even realize exist yet... but I do think I'm pretty near. Now, what remains to be done? Well, as Ove mentions in the TODO for his units, "a whole lot." Here are several things in no particular order: - widl is like MIDL for wine. For wine to be a useful RPC platform, quite a bit of work needs to be done here. widl currently doesn't generate stubs for RPC invocation -- it will need to; this is tricky because the MIDL compiler does some really wierd stuff. Then again, we don't neccesarily have to make widl work like MIDL, so it could be worse. - RPC has a quite featureful error handling mechanism; none of it is implemented right now. - The server portions of the patch don't seem to be getting accepted by Alexandre. My guess is that once I have a working test he'll conceed to let this in. To implement this properly is tricky and possibly beyond my abilities; Ove seems to think the right way to do this is to use LPC (Local Procedure Call, another undocumented monster). LPC has no implementation in wine and is not going to be trivial to create. - there are several different memory allocation schemes for MSRPC. I don't even understand what they all are yet, much less have them properly implemented. - MSRPC provides impersonation capabilities which currently are not possible to implement in wine. - Some transports are not yet implemented. The existing transport implementations are incomplete. (By transports I mean, tcp/ip, named-pipes, local procedure call, etc --- the various types of low-level plumbing that can be used to connect the client and the server). - Data marshalling is the means by which RPC represents data across process and machine boundaries. MSRPC extends NDR format for this. The wire protocol is mostly documented, but the MS API's to convert data-types in memory into NDR are not. This, alone, is a sizable chunk of work. - ORPC is RPC for OLE; once we have a working RPC framework, we can use it to implement out-of-process OLE client/server communications. This will be a huge win for wine. But again, it's a lot of work, and I'm no OLE expert (hell, I'm no RPC expert :) - Surely there is much more stuff I am forgetting. Like Ove said, it's "a whole lot" of stuff, approximately as big a project as, say, DirectX. Basically, RPC for wine is a huge beast of a project. IMO it is probably the biggest and most difficult-to-fill hole in wine's feature-completeness ATM. In the short term, don't expect any miracles --- I really doubt that I'm going to "solve" this (in my spare time!) anytime soon. But, once I start getting some results, I imagine others will be enticed to help out, as contributors like Ove already have. (To be clear: Ove enticed me, not the other way around: He did all the "real" work, and deserves way more credit than me for any success I may achieve in the near future). wish me luck, -- gmt "Oh, and of course, the fastest way to dig a tunnel is to dig at both sides." -- The Linux Advanced Routing HOWTO

2 2

Re: using native regedit
by Jeff Smith Oct. 22, 2002

Oct. 22, 2002

Thanks for the advice, this should get me by for now. Of course I would still like DllOverrides section to work as advertised, but maybe I can hack on it some more when I am more in the mood. P.S. Sorry about the HTML message, the Hotmail admins seem to be playing around with default settings. -- Jeff S. >From: Greg Turner To: "Jeff Smith" , wine-devel(a)winehq.com On Tuesday 22 >October 2002 01:01 pm, Jeff Smith wrote: > I know I must be missing > >something very simple, but I cannot seem to > > get native regedit to run. The builtin version always > runs instead. >The only thing I could think of was an entry > in DllOverrides: > > "regedit.exe" = "native, builtin". That did not work. > > > I have debugged a little and know MODULE_GetLoadOrder > is returning >{LOADORDER_BI, LOADORDER_DLL, LOADORDER_INVALID, > LOADORDER_INVALID} even >when I add that DllOverride line. > But I am just not in the mood at the >moment for deep digging if > I can help it. > -- Jeff S. >Well, if my wetware HTML parser is working today, I think I understand your >problem. Just rename regedit.exe to "winregedit.exe" (or whatever you >like), or create a symlink or copy of the native version. (some configs >don't respect symlinks). > >-- >gmt _________________________________________________________________ Surf the Web without missing calls! Get MSN Broadband. http://resourcecenter.msn.com/access/plans/freeactivation.asp

1 0

RE: [RFC] Adding an include/wine/wine directory?
by Patrik Stridvall Oct. 22, 2002

Oct. 22, 2002

> Patrik Stridvall <ps(a)leissner.se> writes: > > > Perhaps (2) and (3) are not much different (se below), > > but (1) and (2/3) are clearly different. > > Well yes, that why they are in different directories. (1) is in > include and (2/3) is in include/wine. Yes, but because of how they are positioned in the filesystemet and used by C they are effectively "packaged together" in a bad way. It seems that I'm not the only one having this problem as well. Steven Edwards also wants a way to use the Mingw/W32api package together with Wine in a sane way. But I have a plan how to smoothly migrated from the current layout to a new layout. See below. > > That is why I think "-I../../include" shouldn't automatically give > > you (2) and (3) as it does now. Having to add -I../../include/wine > > or whatever to get it would make it possible in addition to > > solving my MSVC Microsoft header problem to make it possible to > > uses the Microsoft headers or whomevers headers even on Linux. > > The problem is that then you require everybody who wants to use > Winelib to add stuff to their include path, even if they don't use any > Wine header directly (since our Windows headers reference the Wine > ones). They currently do, yes. That is why I initially suggested creating a include/wine/wine and only moving the "extension" headers like over to include/wine/wine. The "extension" headers are files in include/wine like debug.h, exception.h, library.h, port.h, server.h, test.h, unicode.h that isn't or shouldn't be included by our Windows headers. In the extent that they are it is a bug IMHO and AFAICS one that is quite easily fixed in most cases as well. However, in the first phase to get the all the tests running I AFAICS only need exception.h, test.h and unicode.h. Of them only unicode.h is currently used by the Wine headers (file.h and heap.h). However fixing that shouldn't really be a problem. I will look into it. I suggest that we gradually move the files in include/wine to include/wine/wine or in some cases other places like the DLL directories. Eventually, far in the future, the include/wine directory will be empty (save for a wine directory). This provides a slow and steady migration path from the old to the new that doesn't have any of the problems you described. What more can you ask for? > So you are making the normal case more complex to simplify the > very unusual case of mixing headers. I prefer to ask people who want > to mix headers to do some extra steps and make the common case as easy > as possible. As stated above the problem can be solved. Wine itself is AFAIU (not tested) fixed by this patch. Nothing more should be needed. Index: Make.rules.in =================================================================== RCS file: /home/wine/wine/Make.rules.in,v retrieving revision 1.131 diff -u -r1.131 Make.rules.in --- Make.rules.in 19 Oct 2002 17:15:00 -0000 1.131 +++ Make.rules.in 22 Oct 2002 09:02:33 -0000 @@ -45,7 +45,7 @@ LN = @LN@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ -DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) +DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include -I$(TOPSRCDIR)/include/wine $(EXTRAINCL) ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) LD = @LD@ LDFLAGS = @LDFLAGS@ Normal Winelib application have shouldn't (and needn't) use the Wine "extension" header so they don't need the in the include path them. The few application that does, can be very easily fixed simply by adding an additional -I, which isn't to much to ask IMHO.

3 2

Problem with X11 driver
by Till Mossakowski Oct. 22, 2002

Oct. 22, 2002

Hi, I have a problem with the X11 driver (it seems), related to bug 1027. When I run my program (Fitch.exe), wine gets stuck. All threads do a WaitForMultipleObjects, the main thread a WaitMessage. And I get an error err:ntdll:RtlpWaitForCriticalSection section 0x40af4b04 "x11drv_main.c: X11DRV_CritSection" wait timed out, retrying (60 sec) tid=080b8780 I read the FAQ about critical section errors, and it helped my to get the following calling stack: KERNEL32.DLL.WaitForMultipleObjectsEx+0x16a X11DRV.DLL.MsgWaitForMultipleObjectsEx+0xf3 USER32.DLL.MsgWaitForMultipleObjectsEx+0x14f USER32.DLL.WaitMessage+0x22 WINAWT.DLL.PrintEmbeddedFrame+0x7ca JAVAI.DLL.mmiFrameMethod+0x3625 JAVAI.DLL.mmiFrameMethod+0xb60 COMDLG32.DLL.PrintDlgExW+0x2a2dc0 JPEG.DLL..reloc+0x12e2cb9b *** Invalid address 0xc308c483 (IBMJITC.DLL..reloc+0x1df5f482) (Indeed, Fitch is written in Java - however, unfortunately it is not possible to run it directly under Linux. I also tried to get diagnostic messages from the Java runtime systems, but it seems that all classes are loaded correctly, and then the error occurs.) When I set "Synchronous" = "Y" in the x11drv section of config, everything works, but *very* slowly. Sometimes it takes 15 seconds until a mouse click leads to the desired action. I also played with the other x11drv settings in the config file, but without effect. The documentation says that one should set "Synchronous" = "Y" for debugging purposes. But how proceed then? Greetings, Till -- Till Mossakowski Phone +49-421-218-4683 Dept. of Computer Science Fax +49-421-218-3054 University of Bremen till(a)tzi.de P.O.Box 330440, D-28334 Bremen http://www.tzi.de/~till

2 7

OleAut32.dll.DispCallFunc
by Fabian Cenedese Oct. 22, 2002

Oct. 22, 2002

Hi all My app stumbled over a not implemented function from oleaut32.dll called DispCallFunc. It's only available as stub. I tried to find some info about this but it's an undocumented "feature". MSDN doesn't mention it at all (obviously) and on the net I could only find this short description: *** ITypeInfo::Invoke (or DispInvoke) needs v-table to call-in a method. But when we are talking about pure disp-interfaces - they don't have any info about v-table, but just a mapping between DISPID and method signature. Therefore these functions would fail miserably to convey the call to pure dispinterface, but as all we know - the majority of sources(/events) interfaces are these pesky dispinterfaces. DispCallFunc is a low-level routine (that btw is used by DispInvoke and ITypeInfo::Invoke internally). It pushes arguments from DISPPARAMS argument to the stack accordingly to supplied description of the method, calls specified function pointer and on the return adjusts stack back and return retval (both variant and HRESULT) to the caller. *** And I also found this example: *** //Helper for invoking the event HRESULT InvokeFromFuncInfo(void (__stdcall T::*pEvent)(), _ATL_FUNC_INFO& info, DISPPARAMS* pdispparams, VARIANT* pvarResult) { T* pT = static_cast<T*>(this); VARIANTARG** pVarArgs = info.nParams ? (VARIANTARG**)alloca(sizeof(VARIANTARG*)*info.nParams) : 0; for (int i=0; i<info.nParams; i++) pVarArgs[i] = &pdispparams->rgvarg[info.nParams - i - 1]; CComStdCallThunk<T> thunk; thunk.Init(pEvent, pT); CComVariant tmpResult; if (pvarResult == NULL) pvarResult = &tmpResult; HRESULT hr = DispCallFunc( &thunk, 0, info.cc, info.vtReturn, info.nParams, info.pVarTypes, pVarArgs, pvarResult); ATLASSERT(SUCCEEDED(hr)); return hr; } *** Does anyone know more about this function? Where would this have to be implemented? Thanks bye Fabi

2 1

Re: MZ_Exec() patch, try 3
by Jukka Heinonen Oct. 22, 2002

Oct. 22, 2002

The patch starts to look good, only one tiny thing left: you most likely want to return FALSE from MZ_Exec if CreateProcessA fails. If you want to read all comments to posts on wine-devel you have to take into account different time zones and different mail reading habits - waiting 24 hours should be enough to get replies from all active readers during weekdays. But, anyway, good to see I didn't scare you by being critical :) -- Jukka Heinonen <http://www.iki.fi/jhei/>

1 0

VS6 Package & Deployment Wizard regression
by Ender Oct. 22, 2002

Oct. 22, 2002

Oddly, some recent change has broken some of the command buttons in VS6's Package/Deployment wizard's dialogs.. Does anyone have any suggestions on what'd be some good traces to turn on? Or want to fix it themselves? <grin> - Ender

1 0

RE: [RFC] Adding an include/wine/wine directory?
by Patrik Stridvall Oct. 22, 2002

Oct. 22, 2002

> Patrik Stridvall <ps(a)leissner.se> writes: > > > I would like to have a directory structure like > > > > include: Wine's version of Windows headers > > include/wine: Wine's internal headers > > include/wine/wine: Wine's "extension" headers > > > > With "extension" headers I mean that headers that > > are exported and usuable by Winelib applications. > > That's ugly IMO. The specific solution above, perhaps. However I think it would be very useful to make a proper distinction between 1. The Wine version of Microsoft headers 2. Anything that Wine uses to communicate internal 3. Extensions that Winelib applications can use. Perhaps (2) and (3) are not much different (se below), but (1) and (2/3) are clearly different. That is why I think "-I../../include" shouldn't automatically give you (2) and (3) as it does now. Having to add -I../../include/wine or whatever to get it would make it possible in addition to solving my MSVC Microsoft header problem to make it possible to uses the Microsoft headers or whomevers headers even on Linux. > Besides there is no such distinction between internal > and "extension" headers, all the headers in include/wine are supposed > to be usable by Winelib app. Sure there are. Not all header from include/wine are copied to /usr/local/include/wine/wine during. The ones that are not copied are "internal" and the ones there are are "extensions" in some meaning. Only the "exension" headers (ie header that are copied during install) can be used by Winelib applications. However that might perhaps only be a temporary distiction. Anyway cd include/wine mkdir wine mv *.h wine work for me as well if you prefer that. > I'd suggest you simply copy the ones you > need with MSVC somewhere else to avoid conflicts. Hmm. Yes, that is another possibillity (read: kludge). Don't really like copying source files around, but it would work (with the possible exception of dependecies, but then "Rebuild all" is your friend :-). In short: I still think that we should require another -I to access the Wine specific (internal and extension) headers. However I don't really care if we do (1) -I$(TOPSRCDIR)/include -I$(TOPSRCDIR)/include/wine (2) -I$(TOPSRCDIR)/include -I$(TOPSRCDIR)/$(WHATEVER) I just don't think just doing -I$(TOPSRCDIR)/include like now is good for the reasons given above and below. Sometime you only want the Wine specific header sometimes you only want Wine's version of the Windows header. "Forcing" everybody to take them as a package only gives rise to unnessary problem like the one I'm trying to solve. Sure I could kludge it, but why not try to solve it properly?

3 2

MZ_Exec() patch, try 3
by chrismorgan＠rcn.com Oct. 22, 2002

Oct. 22, 2002

Alright, yet another revision of this patch. This one uses dynamic memory allocation via HeapAlloc/Free(), doesn't modify the input command line and doesn't try to close process handles if CreateProcess failed. Third time a charm? ;-) * dlls/winedos/module.c: Chris Morgan <cmorgan(a)alum.wpi.edu> Call CreateProcessA() when executing non-dos applications from a dos application. Index: dlls/winedos/module.c =================================================================== RCS file: /home/wine/wine/dlls/winedos/module.c,v retrieving revision 1.23 diff -u -r1.23 module.c --- dlls/winedos/module.c 18 Oct 2002 23:48:58 -0000 1.23 +++ dlls/winedos/module.c 21 Oct 2002 22:00:16 -0000 @@ -339,17 +339,78 @@ /*********************************************************************** * MZ_Exec + * + * this may only be called from existing DOS processes */ BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID paramblk ) { - /* this may only be called from existing DOS processes - * (i.e. one DOS app spawning another) */ - /* FIXME: do we want to check binary type first, to check - * whether it's a NE/PE executable? */ + DWORD binType; + STARTUPINFOA st; + PROCESS_INFORMATION pe; + BOOL status; + HANDLE hFile = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); BOOL ret = FALSE; + + if(!GetBinaryTypeA(filename, &binType)) /* determine what kind of binary this is */ + { + return FALSE; /* binary is not an executable */ + } + if (hFile == INVALID_HANDLE_VALUE) return FALSE; + + /* handle non-dos executables */ + if(binType != SCS_DOS_BINARY) + { + if(func == 0) /* load and execute */ + { + LPBYTE fullCmdLine; + WORD fullCmdLength; + LPBYTE psp_start = (LPBYTE)((DWORD)DOSVM_psp << 4); + PDB16 *psp = (PDB16 *)psp_start; + ExecBlock *blk = (ExecBlock *)paramblk; + LPBYTE cmdline = PTR_REAL_TO_LIN(SELECTOROF(blk->cmdline),OFFSETOF(blk->cmdline)); + LPBYTE envblock = PTR_REAL_TO_LIN(psp->environment, 0); + BYTE cmdLength = cmdline[0]; + + fullCmdLength = (strlen(filename) + 1) + cmdLength + 1; /* filename + space + cmdline + terminating null character */ + + fullCmdLine = HeapAlloc(GetProcessHeap(), 0, fullCmdLength); + + /* build the full command line from the executable file and the command line being passed in */ + snprintf(fullCmdLine, fullCmdLength, "%s ", filename); /* start off with the executable filename and a space */ + memcpy(fullCmdLine + strlen(fullCmdLine), cmdline + 1, cmdLength); /* append cmdline onto the end */ + fullCmdLine[fullCmdLength - 1] = 0; /* null terminate string */ + + ZeroMemory (&st, sizeof(STARTUPINFOA)); + st.cb = sizeof(STARTUPINFOA); + status = CreateProcessA (NULL, fullCmdLine, NULL, NULL, TRUE, + 0, envblock, NULL, &st, &pe); + + WaitForSingleObject(pe.hProcess, INFINITE); /* wait here until the child process is complete */ + + HeapFree(GetProcessHeap(), 0, fullCmdLine); /* free the memory we allocated */ + + /* clean up PROCESS_INFORMATION handles if necessary */ + if(status) + { + CloseHandle(pe.hProcess); + CloseHandle(pe.hThread); + } + + ret = TRUE; + } else + { + FIXME("EXEC type of %d not implemented for non-dos executables\n", func); + ret = FALSE; + } + + CloseHandle(hFile); + return ret; + } /* if(binType != SCS_DOS_BINARY) */ + + /* handle dos executables */ switch (func) { case 0: /* load and execute */ case 1: /* load but don't execute */

3 4

Re: Listview V15
by Bobby Bingham Oct. 21, 2002

Oct. 21, 2002

On Mon, Oct 21, 2002 at 10:51:35AM -0400, Dimitrie O. Paun wrote: > > ChangeLog > Updated header documentation to the latest, and greatest. > <snip> > + * -- LVIS_ACTIVATING (not currently supported my comctl32.dll version 6.0) you mean "by" comctl32.dll version 6.0 ? <snip> > + * -- LVN_BEGINDRAG, LVN_BEGINRDRAG hmmm ... how about "LVN_BEGINFRAG, LVN_ENDDRAG" -- Bobby Bingham

2 2