wine-devel

wine-devel@winehq.org

4 participants
84464 discussions

Re: Re: Environment passing
by chrismorgan＠rcn.com 08 Oct '02

08 Oct '02

A very similar approach to what I was working on and it looks like the right thing to do. I haven't had time to test it yes but if you have it should be ok to go in. I'll mail another patch or two to fix other issues relating to environment passing soon. Thanks, Chris > > From: Alexandre Julliard <julliard(a)winehq.com> > Date: 2002/10/08 Tue PM 12:24:28 EDT > To: Chris Morgan <cmorgan(a)alum.wpi.edu> > CC: <wine-devel(a)winehq.com> > Subject: Re: Environment passing > > Chris Morgan <cmorgan(a)alum.wpi.edu> writes: > > > I've been looking into exactly what is broken with environment passing in > > CreateProcess() and the functions it uses. What appears to be breaking > > things at this point is just what Eric mentioned, that we mess with the PATH > > environment variable inside of fork_and_exec() and then we call out to > > execve() with this modified environment. It appears that we really do need > > to mess with the PATH environment variable to ensure that execve() finds > > things in the correct unix path locations. I was thinking that before we > > execve() that we could copy the current PATH into a variable called __PATH. > > We would then restore PATH in PROCESS_InitWine() from this __PATH. > > Yes, I wrote a patch some time ago to do this, here it is. I think it > should still work but I haven't tested it. Let me know if it works for > you and I'll put it in. > > Index: files/directory.c > =================================================================== > RCS file: /opt/cvs-commit/wine/files/directory.c,v > retrieving revision 1.54 > diff -u -r1.54 directory.c > --- files/directory.c 13 Sep 2002 18:52:01 -0000 1.54 > +++ files/directory.c 8 Oct 2002 15:09:58 -0000 > @@ -160,17 +160,21 @@ > DRIVE_Chdir( drive, DIR_Windows.short_name + 2 ); > } > > - PROFILE_GetWineIniString(wineW, pathW, path_dirW, longpath, MAX_PATHNAME_LEN); > - if (strchrW(longpath, '/')) > + /* Set the environment variables */ > + > + /* set PATH only if not set already */ > + if (!GetEnvironmentVariableW( path_capsW, longpath, MAX_PATHNAME_LEN )) > { > - MESSAGE("Fix your wine config to use DOS drive syntax in [wine] 'Path=' statement! (no '/' allowed)\n"); > - PROFILE_UsageWineIni(); > - ExitProcess(1); > + PROFILE_GetWineIniString(wineW, pathW, path_dirW, longpath, MAX_PATHNAME_LEN); > + if (strchrW(longpath, '/')) > + { > + MESSAGE("Fix your wine config to use DOS drive syntax in [wine] 'Path=' statement! (no '/' allowed)\n"); > + PROFILE_UsageWineIni(); > + ExitProcess(1); > + } > + SetEnvironmentVariableW( path_capsW, longpath ); > } > > - /* Set the environment variables */ > - > - SetEnvironmentVariableW( path_capsW, longpath ); > SetEnvironmentVariableW( temp_capsW, tmp_dir.short_name ); > SetEnvironmentVariableW( tmp_capsW, tmp_dir.short_name ); > SetEnvironmentVariableW( windirW, DIR_Windows.short_name ); > Index: memory/environ.c > =================================================================== > RCS file: /opt/cvs-commit/wine/memory/environ.c,v > retrieving revision 1.37 > diff -u -r1.37 environ.c > --- memory/environ.c 24 Sep 2002 18:29:40 -0000 1.37 > +++ memory/environ.c 8 Oct 2002 15:10:07 -0000 > @@ -152,7 +152,11 @@ > /* Compute the total size of the Unix environment */ > > size = sizeof(BYTE) + sizeof(WORD) + sizeof(ENV_program_name); > - for (e = environ; *e; e++) size += strlen(*e) + 1; > + for (e = environ; *e; e++) > + { > + if (!memcmp( *e, "PATH=", 5 )) continue; > + size += strlen(*e) + 1; > + } > > /* Now allocate the environment */ > > @@ -164,7 +168,10 @@ > > for (e = environ; *e; e++) > { > - strcpy( p, *e ); > + /* skip Unix PATH and store WINEPATH as PATH */ > + if (!memcmp( *e, "PATH=", 5 )) continue; > + if (!memcmp( *e, "WINEPATH=", 9 )) strcpy( p, *e + 4 ); > + else strcpy( p, *e ); > p += strlen(p) + 1; > } > > Index: scheduler/process.c > =================================================================== > RCS file: /opt/cvs-commit/wine/scheduler/process.c,v > retrieving revision 1.200 > diff -u -r1.200 process.c > --- scheduler/process.c 3 Oct 2002 19:54:57 -0000 1.200 > +++ scheduler/process.c 8 Oct 2002 15:10:10 -0000 > @@ -820,9 +820,16 @@ > /* now put the Windows environment strings */ > for (p = env; *p; p += strlen(p) + 1) > { > - if (memcmp( p, "PATH=", 5 ) && > - memcmp( p, "HOME=", 5 ) && > - memcmp( p, "WINEPREFIX=", 11 )) *envptr++ = (char *)p; > + if (!memcmp( p, "PATH=", 5 )) /* store PATH as WINEPATH */ > + { > + char *winepath = malloc( strlen(p) + 5 ); > + strcpy( winepath, "WINE" ); > + strcpy( winepath + 4, p ); > + *envptr++ = winepath; > + } > + else if (memcmp( p, "HOME=", 5 ) && > + memcmp( p, "WINEPATH=", 9 ) && > + memcmp( p, "WINEPREFIX=", 11 )) *envptr++ = (char *)p; > } > *envptr = 0; > } > > -- > Alexandre Julliard > julliard(a)winehq.com > > >

1 0

Re: Re: another MZ_Exec() problem...
by chrismorgan＠rcn.com 08 Oct '02

08 Oct '02

Anyone planning on looking into this in the near term? It could be fixed relatively easily in MZ_Exec() if I knew of some way to get the environment variables and their values. I'm not sure if the same kind of fix would apply to fixing CreateProcess(). Chris > > From: "Eric POUECH" <Eric.Pouech(a)wanadoo.fr> > Date: 2002/09/24 Tue PM 04:48:24 EDT > To: <cmorgan(a)alum.wpi.edu>, <wine-devel(a)winehq.com> > Subject: Re: another MZ_Exec() problem... > > > Inside of MZ_Exec() I call out to CreateProcessA() if the executable is PE. I've set the lpEnvironment parameter of CreateProcessA() to null to have it inherit the environment of the caller but this isn't working correctly. The path and other environment variables aren't being inherited. Ideas on how to either get CreateProcessA() to inherit properly or where I can find the environment settings? I noticed the env_ptr in the parmeter block but I'm unsure if this is what I'm looking for or where to find more information about it. > moreover, explicit env heritage (ie passed in CreateProcess) is currently bugged > A+ > > >

3 2

W(w)indows messages
by Fabian Cenedese 08 Oct '02

08 Oct '02

Hi all I still try to solve the problems I have in window handling. There is a function X11_ShowWindow. First comes a big switch/case of all show commands. Then is the call to SetWindowPos with the new coords. But this newPos is only filled in few cases. So most of the times I end up with a SetWindowPos with coords 0. But still it somehow seems to work so I continued my search. In SetWindowPos is a call to WIN_SetRectangles with newWindowRect and newClientRect as parameters. But in the end is a message generated WM_WINDOWPOSCHANGED where the old winpos with the 0s inside is given as argument. Shouldn't that be also one of the new rects resp. shouldn't these new coords be set in newpos? I tried it but wine broke off with a stack overflow as I somehow generated a recursive calling. I have a call to ShowWindow in my OnWindowPosChanged handler. This works fine in Windows but wine seems to generate a new message WindowPosChanged what Windows doesn't. The use of ShowWindow in OnWindowPosChanged is maybe questionable but nonetheless it shows that there is something different in wine. Deleting this call to ShowWindow makes it run ok. But I noticed also previously that wine seems to generate more messages than Windows does. The main reason why I started this exploration is that some of my docked windows didn't show up. Then I found that I always get coords of 0 in my OnWindowPosChanged. So we come back to the above mentioned newPos. I'm quite new to wine and especially this window handling stuff, but this seems to be the biggest problem to make my app work with wine so I'd really appreciate some hints. If someone knows a book about Windows Messages I'm game. Thanks for reading :) bye Fabi

1 0

Re: updated LT keyboard
by Nerijus Baliunas 08 Oct '02

08 Oct '02

On Sat, 7 Sep 2002 18:36:00 +0200 (EET) Nerijus Baliunas <nerijus(a)users.sourceforge.net> wrote: > It is still not detected, but at least wine chooses it as closest match now, > so it is an improvement. Rewind also can include it. Hello, why this patch is still not applied? Regards, Nerijus

1 0

Languages/Locales
by steve.lustbader＠philips.com 08 Oct '02

08 Oct '02

ChangeLog (memory/codepage.c): Implement GetUserDefaultUILanguage Implement GetSystemDefaultUILanguage I implemented these functions in codepage.c since similar functions (GetDefaultLangID and GetDefaultLCID) were already there. Why are these functions in this file, instead of in dlls/kernel/locale.c? It seems locales and languages aren't really implemented yet (just hardcoded to English) - is this going in for 1.0 or is it not planned for the immediate future? -Steve (See attached file: patch.diff)

4 3

Re: Listview L10
by Paul Rupe 08 Oct '02

08 Oct '02

On 07 Oct 2002, dpaun(a)rogers.com wrote: > This one fixes a lot of nasty bugs. It also fixes Xnews, > among other things. Yeah, it works great now. Cool. :) > This one should bring the listview to a decent state. > I am interested to hear about outstanding problems. One thing I noticed is that File Open/Save As dialogs in any app now show only icons (the filenames are all blank). I think this must have happened somewhere in the L-series of patches, but I haven't delved in to figure out which one yet. -- Paul Rupe "She smiled, in the end." p r u p e @ m y r e a l b o x . c o m | Oppose government police-ware on your PC! | Stop the Consumer Broadband and Digital Television Promotion Act! | <http://www.eff.org/alerts/20020322_eff_cbdtpa_alert.html>

3 2

Re: wine/dlls/rpcrt4 Makefile.in rpcrt4.spec rpcrt ...
by Greg Turner 07 Oct '02

07 Oct '02

On Monday 07 October 2002 04:49 pm, Alexandre Julliard wrote: > ChangeSet ID: 5665 > CVSROOT: /opt/cvs-commit > Module name: wine > Changes by: julliard(a)wine.codeweavers.com 2002/10/07 16:49:49 > > Modified files: > dlls/rpcrt4 : Makefile.in rpcrt4.spec rpcrt4_main.c > Added files: > dlls/rpcrt4 : rpc_binding.c rpc_binding.h > > Log message: > Ove Kaaven <ovek(a)transgaming.com> > Implemented RpcBindingInqObject, RpcBindingSetObject, > RpcBindingVectorFree, RpcBindingToStringBindingA/W, > RpcBindingFromStringBindingA/W, RpcStringBindingParseA/W, > I_RpcBindingSetAsync, RpcStringBindingComposeA/W, RpcBindingFree, > RPCStringFreeW, UUIDHash, UuidToStringW, and associated junk. > > Patch: http://cvs.winehq.com/patch.py?id=5665 > > Old revision New revision Changes Path > 1.8 1.9 +1 -0 wine/dlls/rpcrt4/Makefile.in > 1.19 1.20 +11 -10 wine/dlls/rpcrt4/rpcrt4.spec > 1.29 1.30 +78 -73 wine/dlls/rpcrt4/rpcrt4_main.c > Added 1.1 +0 -0 wine/dlls/rpcrt4/rpc_binding.c > Added 1.1 +0 -0 wine/dlls/rpcrt4/rpc_binding.h Interesting that you unrolled the #define macros in rpc_binding.c. I guess the argument against this is that it creates code duplication. The argument for it is more obvious (reduces insanity). In general, should I avoid submitting patches with big nasty #define's that are really inline functions like this, even at the expense of duplicating some code? Personally, I kind of dislike this sort of thing (big nasty #define's); but I notice that, to an extent, they abound in wine, and I must say that I dislike code duplication almost as much. STL is a good compromise, for C++; but obviously that doesn't help us here in C land (or does it? anyhow, STL is probably not a desirable dependency for wine IMHO). M4 is already a dependency but would be a pretty big break from the current way of doing things... if we're to drag in M4 then we'd might as well rework all of wine to use it in place of the big nasty #defines.... sounds like a miserable and tedious process, and when it's all done, nobody can understand the code (including me, and M4 ignoramus). Ugh. !%&!%& script-soup. When did coding become so much like web-page design? I blame Richard Stallman ;) Rule of thumb: Any program with backquoted backquotes is misdesigned! :) Anyhow, now that I've gotten my bitching and moaning out of the way... let me know if you'd like me to break up #defines like this in future patches and I'll do it. As for the stuff that's already checked in, I'm gonna look at the possibility of dropping some of it into RPCRT4_ functions (/real/ functions) to reduce the duplication. -- gmt "If ye love wealth better than liberty, the tranquility of servitude better than the animating contest of freedom, go home from us in peace. We ask not your counsels or your arms. Crouch down and lick the hands, which feed you. May your chains set lightly upon you, and may posterity forget that ye were our countrymen." -Samuel Adams

2 1

Re: d3d8 patch
by Christian Costa 07 Oct '02

07 Oct '02

Ann and Jason Edmeades wrote: >Changelog: > >o Various fixes, typos corrected and clarifying trace points > >Note I am quickly reaching the end of my ability in this area - This brings >the wine tree up to date with all my changes, so some help from anyone would >be appreciated. There are some 'simple' tutorials type dx8 pgms I just cant >get working and I cant see why - email me if you can help > >Additionally, my understanding is in Windows a HAL lives under direct3d and >earlier directdraw functionality - Does anyone know where the interface is >actually documented? I have had it mentioned to me it would be better to try >to make the functionality more common with direct draw and want to see how >this is done under windows. > >Jason > Jason, The Windows HAL is documented in the DDK (Driver Development Kit). It's a package of 60MBytes or so . You can find it at : http://www.microsoft.com/ddk/ If think (but I'm not sure) the actual HAL is the Win98's one. So you should try the Win98 DDK. It's the one I use. Christian

1 0

Re: Languages/Locales
by steve.lustbader＠philips.com 07 Oct '02

07 Oct '02

Should I resubmit this patch with the my functions moved to locale.c or ole2nls.c? Which one? Alexandre Julliard To: Steve Lustbader/ANR/MS/PHILIPS@AMEC <julliard@winehq cc: wine-devel(a)winehq.com .com> Subject: Re: Languages/Locales Sent by: wine-devel-admin Classification: @winehq.com 10/07/2002 02:02 PM steve.lustbader(a)philips.com writes: > I implemented these functions in codepage.c since similar functions > (GetDefaultLangID and GetDefaultLCID) were already there. Why are > these functions in this file, instead of in dlls/kernel/locale.c? Because they are needed by ntdll. This will be fixed eventually. > It seems locales and languages aren't really implemented yet > (just hardcoded to English) - is this going in for 1.0 or is it not planned > for the immediate future? Most of it is already implemented; the relevant stuff is in dlls/kernel/locale.c and ole/ole2nls.c. -- Alexandre Julliard julliard(a)winehq.com

2 1

Re: Listview L2
by Paul Rupe 07 Oct '02

07 Oct '02

On 06 Oct 2002, dpaun(a)rogers.com wrote: > Another rounds of cleanups > > ChangeLog > -- Cleanup of the way we maintain/lookup the item count > -- Rename GetItemWidth to CalculateMaxWidth > -- Misc trivial changes. It looks like this one breaks Xnews again. With CVS+L0+L1+L2+my patch, the listviews all display as blank. A later patch adds a missing line "infoPtr->nItemCount = nItems;" in LISTVIEW_SetItemCount. This fixes the display problem, but I am still unable to open any newsgroups. Highlighting one and hitting Enter gives me an error from the app "List index (-1) out of bounds," suggesting that it doesn't know that anything is focused/selected. L0 and L1 appear to be fine, but L2-L8 all have this behavior. -- Paul Rupe "She smiled, in the end." p r u p e @ m y r e a l b o x . c o m | Oppose government police-ware on your PC! | Stop the Consumer Broadband and Digital Television Promotion Act! | <http://www.eff.org/alerts/20020322_eff_cbdtpa_alert.html>

2 1

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