March 2003 - Wine-Devel - list.winehq.org

mail address
by Eric Pouech March 14, 2003

March 14, 2003

just to let you know that I had to change my email address... and that I have lost every mail sent since yesterday... so if you did send some mail to me outside of the wine official ML:s, then it may be good that you send them back TIA A+ -- Eric Pouech

1 0

Re: PATCH: dlls/ddraw/ddraw/hal.c
by Alexandre Julliard March 14, 2003

March 14, 2003

Gerald Pfeifer <pfeifer(a)dbai.tuwien.ac.at> writes: > This hasn't been applied; did I miss anything (that is, is this patch > somehow broken)? If the function doesn't have the right signature it should be fixed, adding a cast is just hiding the bug. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: (resend) some ntdll functions (2a) - part 2: tests
by Alexandre Julliard March 14, 2003

March 14, 2003

thomas.mertes(a)gmx.at writes: > Here are the tests for some ntdll functions. > The patch containing the functions was accepted. > Alexandre, can you tell me, why the patch with > the tests is not commited in CVS (I could not > find it in wine-cvs(a)winehq.com) ? Sorry, forgot to send you a note. Basically I think it would be much better to test the A and W functions in the same file, instead of duplicating all the test cases in two separate files. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: ListView Part2
by Dimitrie O. Paun March 14, 2003

March 14, 2003

On March 14, 2003 02:22 am, Vitaliy Margolen wrote: > - INT cy = HIWORD(spacing), cx = LOWORD(spacing); > + signed short int cy = HIWORD(spacing), cx = LOWORD(spacing); Good spotting! An alternative fix is to us SHIWORD() and SLOWORD() instead. But since we're here, the pattern is to decode this sort of thing directly in LISTVIEW_WindowProc(), so let's do just that: ChangeLog Spacing information is signed (debugged and fixed by Vitaliy Margolen). Decode spacing information in the window procedure. Some spelling fixes. Index: dlls/comctl32/listview.c =================================================================== RCS file: /var/cvs/wine/dlls/comctl32/listview.c,v retrieving revision 1.343 diff -u -r1.343 listview.c --- dlls/comctl32/listview.c 7 Mar 2003 20:35:30 -0000 1.343 +++ dlls/comctl32/listview.c 14 Mar 2003 13:59:57 -0000 @@ -937,7 +937,7 @@ * - a special item to deal with * - simple range, or composite range * - empty range. - * If find bugs, or want to add features, please make sure you + * If you find bugs, or want to add features, please make sure you * always check/modify *both* iterator_prev, and iterator_next. */ @@ -1249,7 +1249,7 @@ return LISTVIEW_GetItemT(infoPtr, lpLVItem, TRUE); } -/* Listview invlaidation functions: use _only_ these function to invalidate */ +/* Listview invalidation functions: use _only_ these functions to invalidate */ static inline BOOL is_redrawing(LISTVIEW_INFO *infoPtr) { @@ -6478,12 +6478,13 @@ * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure - * [I] spacing : MAKELONG(cx, cy) + * [I] cx : horizontal spacing (-1 = system spacing, 0 = autosize) + * [I] cy : vertical spacing (-1 = system spacing, 0 = autosize) * * RETURN: * MAKELONG(oldcx, oldcy) */ -static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, DWORD spacing) +static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) { INT cy = HIWORD(spacing), cx = LOWORD(spacing); DWORD oldspacing = MAKELONG(infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy); @@ -6567,7 +6568,7 @@ himlOld = infoPtr->himlNormal; infoPtr->himlNormal = himl; if (uView == LVS_ICON) set_icon_size(&infoPtr->iconSize, himl, FALSE); - LISTVIEW_SetIconSpacing(infoPtr, 0); + LISTVIEW_SetIconSpacing(infoPtr, 0, 0); break; case LVSIL_SMALL: @@ -8298,7 +8299,7 @@ { TRACE("icon old size=(%ld,%ld), new size=(%ld,%ld)\n", oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); - LISTVIEW_SetIconSpacing(infoPtr, 0); + LISTVIEW_SetIconSpacing(infoPtr, 0, 0); } } else if (uNewView == LVS_REPORT) @@ -8620,7 +8621,7 @@ return LISTVIEW_SetHoverTime(infoPtr, (DWORD)wParam); case LVM_SETICONSPACING: - return LISTVIEW_SetIconSpacing(infoPtr, (DWORD)lParam); + return LISTVIEW_SetIconSpacing(infoPtr, SLOWORD(lParam), SHIWORD(lParam)); case LVM_SETIMAGELIST: return (LRESULT)LISTVIEW_SetImageList(infoPtr, (INT)wParam, (HIMAGELIST)lParam); -- Dimi.

1 0

Re: Doc
by Mike Hearn March 14, 2003

March 14, 2003

Alexandre regenerates the authors list every so often from the ChangeLog. He did it just recently, so you may have missed the latest round, but don't worry - you will be added to the hall of shame*cough*fame :) On Thu, 2003-03-13 at 17:52, Maxime Bellengé wrote: > Adding me to the author list if my patches are accepted of course :). > > ChangeLog: > - Add myself to the author list. -- Mike Hearn <m.hearn(a)signal.qinetiq.com> QinetiQ - Malvern Technology Center

1 0

Re: Fix for ArrangeCtrlPositions in commdlg
by Maxime Bellengé March 14, 2003

March 14, 2003

I apologize for the multiple posts that sometimes come from me. I need to change my email program :) On Wed, 2003-03-12 at 23:54, Maxime Bellengé wrote: > This patch replaces my previous patches. > It fixes the computation of the file dialog box size and the component > placement. > > Now WinHex open dialog box looks fine as well as VirtualDub, Winzip. > > The new algorithm is partially based on information found at > http://www.bridgespublishing.com/articles/issues/0201/Custom_Open_dialogs__… > > ChangeLog: > - Fix how the size of the dialog is computed and the child component > placed. -- Maxime Bellengé <maxime.bellenge(a)laposte.net>

2 1

Re: ntdll Rtl Strings
by thomas.mertes＠gmx.at March 14, 2003

March 14, 2003

Hello In your patch you changed the comment of "my" RtlCharToInteger function: > @@ -870,16 +1049,21 @@ > * > * Convert a character string into its integer equivalent. > * > - * On success assign an integer value and return STATUS_SUCCESS. > - * For base 0 accept: {whitespace} [+|-] [0[x|o|b]] {digits} > - * For bases 2, 8, 10 and 16 accept: {whitespace} [+|-] {digits} > - * For other bases return STATUS_INVALID_PARAMETER. > - * For value == NULL return STATUS_ACCESS_VIOLATION. > - * No check of value overflow: Just assign lower 32 bits (as native DLL). > - * Do not check for str != NULL (as native DLL). > + * PARAMS > + * str [I] String containing number > + * base [I] Number base for conversion > + * value [O] Destination for converted value > + * > + * RETURNS > + * Success: STATUS_SUCCESS. value contains the converted number > + * Failure: STATUS_ACCESS_VIOLATION, if value is NULL. > + * STATUS_INVALID_PARAMETER, if base is not 2, 8, 10 or 16. > * > - * Difference: > - * - Do not read garbage behind '\0' as native DLL does. > + * NOTES > + * The string should be in the format "{whitespace} [+|-] [0[x|o|b]] {digits}". > + * No check is made for value overflow, only the lower 32 bits are assigned. > + * If str is NULL this function will crash. > + * This function does not read garbage behind '\0' as the native version does. > */ > NTSTATUS WINAPI RtlCharToInteger( > PCSZ str, If you want to reformat it (to automatically generate documentation) this is ok. But please don't remove information. My documentation was not copied from the M$ documentation. It needed testing (see: dlls/ntdll/tests/rtlstr.c) to find out that For base 0 it accepts: {whitespace} [+|-] [0[x|o|b]] {digits} For bases 2, 8, 10 and 16 it accepts: {whitespace} [+|-] {digits} This is more precise and better information than the M$ documentation (which for other functions I implemented is sometimes misleading or just wrong). I want our documentation to be better than the original. I created a "Difference" section that the differences between the native and the wine function really stand out. For example: I am not always capable to find out which garbage values are generated by native functions. In such cases the "Difference" section gives this information. When an application works with the native function, but not with the wine function (it really requests these garbage values) the "Difference" section gives an entry to "improve" the wine function. So: Feel free to reformat the comments of "my" functions, but do not remove information. Greetings Thomas Mertes -- +++ GMX - Mail, Messaging & more http://www.gmx.net +++ Bitte lächeln! Fotogalerie online mit GMX ohne eigene Homepage!

1 0

Re: ntdll/kernel32: #6
by Alexandre Julliard March 14, 2003

March 14, 2003

Eric Pouech <eric.pouech(a)wanadoo.fr> writes: > (Alexandre, in order to handle correctly the loader_critsect between > ntdll & kernel32, what do you suggest ? NT does it thru the > fastpeblock in the PEB, which we don't implement. shall we add to the > PDB in some unused field (which means we do export the PDB struct out > of scheduler/process.c, but you seemed to reluctant to do so so far) Note that the PEB lock and the loader section are not the same thing. The loader section corresponds to the LoaderLock field in the PEB. I think we should use the same thing, and access it like we do for the process heap, at least for now. > +NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* mod) > +{ > + WINE_MODREF* wm; > + NTSTATUS nts = STATUS_NO_MORE_ENTRIES; > + > + RtlEnterCriticalSection( &loader_section ); > + if (!addr) > + { > + wm = exe_modref; > + } This doesn't look right, address 0 is not inside the executable. Are you sure NT does it this way? -- Alexandre Julliard julliard(a)winehq.com

1 0

DPRINTF->TRACE windows
by Tony Lambregts March 14, 2003

March 14, 2003

Change Log: Replace DPRINTF with TRACE Files changed: windows/dialog.c windows/win.c windows/winpos.c Files not changed: windows/dce.c windows/winproc -- Tony Lambregts Index: dialog.c =================================================================== RCS file: /home/wine/wine/windows/dialog.c,v retrieving revision 1.112 diff -u -u -r1.112 dialog.c --- dialog.c 2 Dec 2002 18:10:57 -0000 1.112 +++ dialog.c 14 Mar 2003 02:29:44 -0000 @@ -391,8 +391,8 @@ WORD i, count = GET_WORD(p) / sizeof(WORD); TRACE(" BEGIN\n"); TRACE(" "); - for (i = 0; i < count; i++) DPRINTF( "%04x,", GET_WORD(p+i+1) ); - DPRINTF("\n"); + for (i = 0; i < count; i++) TRACE( "%04x,", GET_WORD(p+i+1) ); + TRACE("\n"); TRACE(" END\n" ); } info->data = p + 1; Index: win.c =================================================================== RCS file: /home/wine/wine/windows/win.c,v retrieving revision 1.215 diff -u -u -r1.215 win.c --- win.c 8 Jan 2003 21:09:25 -0000 1.215 +++ win.c 14 Mar 2003 02:29:45 -0000 @@ -894,28 +894,28 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) { TRACE( "style:" ); - if(style & WS_POPUP) DPRINTF(" WS_POPUP"); - if(style & WS_CHILD) DPRINTF(" WS_CHILD"); - if(style & WS_MINIMIZE) DPRINTF(" WS_MINIMIZE"); - if(style & WS_VISIBLE) DPRINTF(" WS_VISIBLE"); - if(style & WS_DISABLED) DPRINTF(" WS_DISABLED"); - if(style & WS_CLIPSIBLINGS) DPRINTF(" WS_CLIPSIBLINGS"); - if(style & WS_CLIPCHILDREN) DPRINTF(" WS_CLIPCHILDREN"); - if(style & WS_MAXIMIZE) DPRINTF(" WS_MAXIMIZE"); - if((style & WS_CAPTION) == WS_CAPTION) DPRINTF(" WS_CAPTION"); + if(style & WS_POPUP) TRACE(" WS_POPUP"); + if(style & WS_CHILD) TRACE(" WS_CHILD"); + if(style & WS_MINIMIZE) TRACE(" WS_MINIMIZE"); + if(style & WS_VISIBLE) TRACE(" WS_VISIBLE"); + if(style & WS_DISABLED) TRACE(" WS_DISABLED"); + if(style & WS_CLIPSIBLINGS) TRACE(" WS_CLIPSIBLINGS"); + if(style & WS_CLIPCHILDREN) TRACE(" WS_CLIPCHILDREN"); + if(style & WS_MAXIMIZE) TRACE(" WS_MAXIMIZE"); + if((style & WS_CAPTION) == WS_CAPTION) TRACE(" WS_CAPTION"); else { - if(style & WS_BORDER) DPRINTF(" WS_BORDER"); - if(style & WS_DLGFRAME) DPRINTF(" WS_DLGFRAME"); + if(style & WS_BORDER) TRACE(" WS_BORDER"); + if(style & WS_DLGFRAME) TRACE(" WS_DLGFRAME"); } - if(style & WS_VSCROLL) DPRINTF(" WS_VSCROLL"); - if(style & WS_HSCROLL) DPRINTF(" WS_HSCROLL"); - if(style & WS_SYSMENU) DPRINTF(" WS_SYSMENU"); - if(style & WS_THICKFRAME) DPRINTF(" WS_THICKFRAME"); - if(style & WS_GROUP) DPRINTF(" WS_GROUP"); - if(style & WS_TABSTOP) DPRINTF(" WS_TABSTOP"); - if(style & WS_MINIMIZEBOX) DPRINTF(" WS_MINIMIZEBOX"); - if(style & WS_MAXIMIZEBOX) DPRINTF(" WS_MAXIMIZEBOX"); + if(style & WS_VSCROLL) TRACE(" WS_VSCROLL"); + if(style & WS_HSCROLL) TRACE(" WS_HSCROLL"); + if(style & WS_SYSMENU) TRACE(" WS_SYSMENU"); + if(style & WS_THICKFRAME) TRACE(" WS_THICKFRAME"); + if(style & WS_GROUP) TRACE(" WS_GROUP"); + if(style & WS_TABSTOP) TRACE(" WS_TABSTOP"); + if(style & WS_MINIMIZEBOX) TRACE(" WS_MINIMIZEBOX"); + if(style & WS_MAXIMIZEBOX) TRACE(" WS_MAXIMIZEBOX"); /* FIXME: Add dumping of BS_/ES_/SBS_/LBS_/CBS_/DS_/etc. styles */ #define DUMPED_STYLES \ @@ -938,29 +938,29 @@ WS_MINIMIZEBOX | \ WS_MAXIMIZEBOX) - if(style & ~DUMPED_STYLES) DPRINTF(" %08lx", style & ~DUMPED_STYLES); - DPRINTF("\n"); + if(style & ~DUMPED_STYLES) TRACE(" %08lx", style & ~DUMPED_STYLES); + TRACE("\n"); #undef DUMPED_STYLES TRACE( "exstyle:" ); - if(exstyle & WS_EX_DLGMODALFRAME) DPRINTF(" WS_EX_DLGMODALFRAME"); - if(exstyle & WS_EX_DRAGDETECT) DPRINTF(" WS_EX_DRAGDETECT"); - if(exstyle & WS_EX_NOPARENTNOTIFY) DPRINTF(" WS_EX_NOPARENTNOTIFY"); - if(exstyle & WS_EX_TOPMOST) DPRINTF(" WS_EX_TOPMOST"); - if(exstyle & WS_EX_ACCEPTFILES) DPRINTF(" WS_EX_ACCEPTFILES"); - if(exstyle & WS_EX_TRANSPARENT) DPRINTF(" WS_EX_TRANSPARENT"); - if(exstyle & WS_EX_MDICHILD) DPRINTF(" WS_EX_MDICHILD"); - if(exstyle & WS_EX_TOOLWINDOW) DPRINTF(" WS_EX_TOOLWINDOW"); - if(exstyle & WS_EX_WINDOWEDGE) DPRINTF(" WS_EX_WINDOWEDGE"); - if(exstyle & WS_EX_CLIENTEDGE) DPRINTF(" WS_EX_CLIENTEDGE"); - if(exstyle & WS_EX_CONTEXTHELP) DPRINTF(" WS_EX_CONTEXTHELP"); - if(exstyle & WS_EX_RIGHT) DPRINTF(" WS_EX_RIGHT"); - if(exstyle & WS_EX_RTLREADING) DPRINTF(" WS_EX_RTLREADING"); - if(exstyle & WS_EX_LEFTSCROLLBAR) DPRINTF(" WS_EX_LEFTSCROLLBAR"); - if(exstyle & WS_EX_CONTROLPARENT) DPRINTF(" WS_EX_CONTROLPARENT"); - if(exstyle & WS_EX_STATICEDGE) DPRINTF(" WS_EX_STATICEDGE"); - if(exstyle & WS_EX_APPWINDOW) DPRINTF(" WS_EX_APPWINDOW"); - if(exstyle & WS_EX_LAYERED) DPRINTF(" WS_EX_LAYERED"); + if(exstyle & WS_EX_DLGMODALFRAME) TRACE(" WS_EX_DLGMODALFRAME"); + if(exstyle & WS_EX_DRAGDETECT) TRACE(" WS_EX_DRAGDETECT"); + if(exstyle & WS_EX_NOPARENTNOTIFY) TRACE(" WS_EX_NOPARENTNOTIFY"); + if(exstyle & WS_EX_TOPMOST) TRACE(" WS_EX_TOPMOST"); + if(exstyle & WS_EX_ACCEPTFILES) TRACE(" WS_EX_ACCEPTFILES"); + if(exstyle & WS_EX_TRANSPARENT) TRACE(" WS_EX_TRANSPARENT"); + if(exstyle & WS_EX_MDICHILD) TRACE(" WS_EX_MDICHILD"); + if(exstyle & WS_EX_TOOLWINDOW) TRACE(" WS_EX_TOOLWINDOW"); + if(exstyle & WS_EX_WINDOWEDGE) TRACE(" WS_EX_WINDOWEDGE"); + if(exstyle & WS_EX_CLIENTEDGE) TRACE(" WS_EX_CLIENTEDGE"); + if(exstyle & WS_EX_CONTEXTHELP) TRACE(" WS_EX_CONTEXTHELP"); + if(exstyle & WS_EX_RIGHT) TRACE(" WS_EX_RIGHT"); + if(exstyle & WS_EX_RTLREADING) TRACE(" WS_EX_RTLREADING"); + if(exstyle & WS_EX_LEFTSCROLLBAR) TRACE(" WS_EX_LEFTSCROLLBAR"); + if(exstyle & WS_EX_CONTROLPARENT) TRACE(" WS_EX_CONTROLPARENT"); + if(exstyle & WS_EX_STATICEDGE) TRACE(" WS_EX_STATICEDGE"); + if(exstyle & WS_EX_APPWINDOW) TRACE(" WS_EX_APPWINDOW"); + if(exstyle & WS_EX_LAYERED) TRACE(" WS_EX_LAYERED"); #define DUMPED_EX_STYLES \ (WS_EX_DLGMODALFRAME | \ @@ -982,8 +982,8 @@ WS_EX_APPWINDOW | \ WS_EX_LAYERED) - if(exstyle & ~DUMPED_EX_STYLES) DPRINTF(" %08lx", exstyle & ~DUMPED_EX_STYLES); - DPRINTF("\n"); + if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08lx", exstyle & ~DUMPED_EX_STYLES); + TRACE("\n"); #undef DUMPED_EX_STYLES } Index: winpos.c =================================================================== RCS file: /home/wine/wine/windows/winpos.c,v retrieving revision 1.143 diff -u -u -r1.143 winpos.c --- winpos.c 8 Jan 2003 21:09:25 -0000 1.143 +++ winpos.c 14 Mar 2003 02:29:46 -0000 @@ -1127,19 +1127,19 @@ static void dump_winpos_flags(UINT flags) { TRACE("flags:"); - if(flags & SWP_NOSIZE) DPRINTF(" SWP_NOSIZE"); - if(flags & SWP_NOMOVE) DPRINTF(" SWP_NOMOVE"); - if(flags & SWP_NOZORDER) DPRINTF(" SWP_NOZORDER"); - if(flags & SWP_NOREDRAW) DPRINTF(" SWP_NOREDRAW"); - if(flags & SWP_NOACTIVATE) DPRINTF(" SWP_NOACTIVATE"); - if(flags & SWP_FRAMECHANGED) DPRINTF(" SWP_FRAMECHANGED"); - if(flags & SWP_SHOWWINDOW) DPRINTF(" SWP_SHOWWINDOW"); - if(flags & SWP_HIDEWINDOW) DPRINTF(" SWP_HIDEWINDOW"); - if(flags & SWP_NOCOPYBITS) DPRINTF(" SWP_NOCOPYBITS"); - if(flags & SWP_NOOWNERZORDER) DPRINTF(" SWP_NOOWNERZORDER"); - if(flags & SWP_NOSENDCHANGING) DPRINTF(" SWP_NOSENDCHANGING"); - if(flags & SWP_DEFERERASE) DPRINTF(" SWP_DEFERERASE"); - if(flags & SWP_ASYNCWINDOWPOS) DPRINTF(" SWP_ASYNCWINDOWPOS"); + if(flags & SWP_NOSIZE) TRACE(" SWP_NOSIZE"); + if(flags & SWP_NOMOVE) TRACE(" SWP_NOMOVE"); + if(flags & SWP_NOZORDER) TRACE(" SWP_NOZORDER"); + if(flags & SWP_NOREDRAW) TRACE(" SWP_NOREDRAW"); + if(flags & SWP_NOACTIVATE) TRACE(" SWP_NOACTIVATE"); + if(flags & SWP_FRAMECHANGED) TRACE(" SWP_FRAMECHANGED"); + if(flags & SWP_SHOWWINDOW) TRACE(" SWP_SHOWWINDOW"); + if(flags & SWP_HIDEWINDOW) TRACE(" SWP_HIDEWINDOW"); + if(flags & SWP_NOCOPYBITS) TRACE(" SWP_NOCOPYBITS"); + if(flags & SWP_NOOWNERZORDER) TRACE(" SWP_NOOWNERZORDER"); + if(flags & SWP_NOSENDCHANGING) TRACE(" SWP_NOSENDCHANGING"); + if(flags & SWP_DEFERERASE) TRACE(" SWP_DEFERERASE"); + if(flags & SWP_ASYNCWINDOWPOS) TRACE(" SWP_ASYNCWINDOWPOS"); #define DUMPED_FLAGS \ (SWP_NOSIZE | \ @@ -1156,8 +1156,8 @@ SWP_DEFERERASE | \ SWP_ASYNCWINDOWPOS) - if(flags & ~DUMPED_FLAGS) DPRINTF(" %08x", flags & ~DUMPED_FLAGS); - DPRINTF("\n"); + if(flags & ~DUMPED_FLAGS) TRACE(" %08x", flags & ~DUMPED_FLAGS); + TRACE("\n"); #undef DUMPED_FLAGS }

1 0

running wineboot from the server - HELP!
by Shachar Shemesh March 13, 2003

March 13, 2003

Hi, I know I promised this over three weeks ago, but things have been very busy for me lately. This email is slightly long. Please please please read through it. I need help to get wineboot working automatically (a blocking issue for 0.9), and I need someone who understands both the server and the loading order to comment. This is the first part of the required change. Applying it at the moment does not make sense, as I am not yet sure that this is the right one (it may make more sense to point the env at the .exe.so file rather than the wrapper - more about that in a second). I am, more or less, ready to give up. Someone suggested I look at the way caching the font metrics delays normal load. Well, I tried. I'm not sure I got it right, though. If I understand correctly, the way to go for wineboot to run is this: wineboot, upon first run, will aquire a system wide named mutex that means "I am working on it". If the mutex exists, it will block on it. Once it got it it will immediatly release it and exit. If the mutext doesn't exist at all, it will aquire it and do it's magic. Once done it will release it, but not delete it, and exit. All that is left to do is that all programs must load wineboot as part of the startup. It may require modifying it to be a DLL instead of an EXE, but so be it. Can someone who understands the server, and the interaction between the server and normal apps comment on this scheme? Also, how do I at all make each and every prog load wineboot.dll? Shachar -- Shachar Shemesh Open Source integration consultant Home page & resume - http://www.shemesh.biz/ Index: programs/winelauncher.in =================================================================== RCS file: /home/sun/sources/cvs/wine/programs/winelauncher.in,v retrieving revision 1.2 diff -u -r1.2 winelauncher.in --- programs/winelauncher.in 5 Jul 2002 21:18:41 -0000 1.2 +++ programs/winelauncher.in 10 Mar 2003 21:27:27 -0000 @@ -37,6 +37,7 @@ WINEBIN=@bindir@ WINELIB=@libdir@ WINESERVER= +WINEBOOT= WINEDLLPATH=@dlldir@ #------------------------------------------------------------------------------ @@ -178,12 +179,20 @@ WINESERVER=$WINEBIN/wineserver fi +if [ -x $WINEBIN/wineboot ] ; then + WINEBOOT=$WINEBIN/wineboot +fi + #------------------------------------------------------------------------------ # Hey, if we built Wine from source, let's add a little extra fun to # mix it up a bit #------------------------------------------------------------------------------ if [ -x $WINEBIN/server/wineserver ] ; then WINESERVER=$WINEBIN/server/wineserver +fi + +if [ -x $WINEBIN/programs/wineboot/wineboot ] ; then + WINEBOOT=$WINEBIN/programs/wineboot/wineboot fi if [ -r $WINELIB/dlls/ntdll.dll.so ] ; then Index: tools/winewrapper =================================================================== RCS file: /home/sun/sources/cvs/wine/tools/winewrapper,v retrieving revision 1.3 diff -u -r1.3 winewrapper --- tools/winewrapper 25 Sep 2002 03:29:56 -0000 1.3 +++ tools/winewrapper 23 Feb 2003 13:49:11 -0000 @@ -70,8 +70,9 @@ fi WINEDLLPATH="$topdir/dlls:$topdir/programs" WINESERVER="$topdir/server/wineserver" +WINEBOOT="$topdir/programs/wineboot/wineboot" WINELOADER="$topdir/miscemu/wine" -export LD_LIBRARY_PATH WINEDLLPATH WINESERVER WINELOADER +export LD_LIBRARY_PATH WINEDLLPATH WINESERVER WINEBOOT WINELOADER # any local settings ? if [ -f "$topdir/.winewrapper" ]

12 19