I need to generate diffs between my previous patch and the current one.
Unsuprisingly (as Alexander is on vacation), the previous patch was not
applied.
When diffing against CVS, I usually just do "cvs diff -u". In this case,
I have checked out a new tree from CVS, applied the old diff on that
tree (so I have a tree that is the way CVS would look if my previous
patch was applied). Now what?
I tried running "diff -u -r wine.ref wine". The problem is that this
generated tons of diffs in files in the "CVS" directory. Don't ask me
why there were differences there.
Any other ideas? I know other people have done this before...
Shachar
--
Shachar Shemesh
Open Source integration consultant
Home page & resume - http://www.shemesh.biz/
Hello,
I have been checking some apps what had problems in order
to install in Managed Mode (due to background above the
continue window) and after of apply the change what i sent
yesterday it started to work. With luck it should work for
every Installshield app. Now the question:
Do you know more apps with problems installing in managed mode?
Thanks.
Regards,
Carlos.
Pd: it is the change:
dlls/x11drv/windows.c
inline static BOOL is_window_managed( WND *win )
{
if (!managed_mode) return FALSE;
/* tray window is always managed */
if (win->dwExStyle & WS_EX_TRAYWINDOW) return TRUE;
/* child windows are not managed */
if (win->dwStyle & WS_CHILD) return FALSE;
/* tool windows are not managed */
if (win->dwExStyle & WS_EX_TOOLWINDOW) return FALSE;
/* windows with caption or thick frame are managed */
if ((win->dwStyle & WS_CAPTION) == WS_CAPTION) return TRUE;
if (win->dwStyle & WS_THICKFRAME) return TRUE;
/**************** New code *****************************/
if ((win->dwStyle & (WS_CLIPSIBLINGS|WS_CLIPCHILDREN) ) ==
(WS_CLIPSIBLINGS|WS_CLIPCHILDREN))
return TRUE;
/************** End new code ***************************/
/* default: not managed */
return FALSE;
}
--
___ _ \ | / Consulting
| . |._ _ _| | ___ ___ ___ http://www.andago.com
| || ' |/ . |<_> |/ . |/ . \__ GNU/Linux
|_|_||_|_|\___|<___|\_. |\___/ _ \ __|\ \ /
Carlos A. Lozano <___'/ | \ -_) __/\__ \ > < -_)
[ carlos.lozano(a)andago.com ]\___|_| ____/ _/\_\___|
[ calb(a)epsxe.com ] http://www.ePSXe.com
Since some surface types are unhandled for now, OffScreenPlain is
assumed.
Unused members of the DDSURFACEDESC2 structure are set to zero,
so the bitperpixel is zero.
DDRAW_width_bpp_to_pitch is called with bpp 0 and apps are stopping on
assert(bpp != 0); /* keeps happening... */
At least WinDVD starts with this patch, will it be accepted until we
implement other surface types ?
Index: ddraw/main.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/ddraw/main.c,v
retrieving revision 1.40
diff -u -r1.40 main.c
--- ddraw/main.c 11 May 2003 03:46:53 -0000 1.40
+++ ddraw/main.c 28 May 2003 22:03:46 -0000
@@ -525,6 +525,9 @@
if (!(ddsd.dwFlags & DDSD_PIXELFORMAT))
{
ddsd.u4.ddpfPixelFormat = This->pixelformat;
+ } else {
+ if( !GET_BPP(ddsd))
+ return DDERR_INVALIDPIXELFORMAT;
}
if (!(ddsd.dwFlags & DDSD_PITCH))
=====
Sylvain Petreolle (spetreolle at users dot sourceforge dot net) ICQ #170597259
No more War !
"What if tomorrow the War could be over ?" Morpheus, in "Reloaded".
For the Law of Oil and Fire, Im an European that lives in France.
For all my Brothers and friends, Im a human living on Earth.
___________________________________________________________
Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français !
Yahoo! Mail : http://fr.mail.yahoo.com
Hello :
At this moment i'm writing a socket class, quite similar to
Winsock OCX control. It is written using unix sockets and threads.
One of the goals of this project would be replacing current native Winsock control by a "Bultin OCX". I've look at Wine Documentation
ant it's simple to create a native DLL, but i've seen nothing
about the possibility of creating a builtin OCX. Is there any way
to do it? What about registry issues?
Thanks
Daniel Campos
_______________________________________________
No banners. No pop-ups. No kidding.
Introducing My Way - http://www.myway.com
On May 29, 2003 04:37 am, Tom Wickline wrote:
> 3) update : Is there a CVS tree? ( -z3 to -z0 and add the notice )
Please don't make that -z 0 explicit in there, just say:
cvs checkout wine/ANNOUNCE
and remove the "slow link" comment. In fact, for those questions
I would simply direct people to the WineHQ CVS/download pages, no
point in maintaining the information in multiple places.
--
Dimi.
Hmmm, as a follow up, changing
if ((flags & DCX_CLIPCHILDREN) && (mode != ClipByChildren))
to
if (flags & DCX_CLIPCHILDREN)
in get_visible_region fixes it. I assume altering the assignment in
GetDC would have the same effect.
I think this is what you were talking about earlier with Wine vs X11
clipping.... it seems in this case leaving it up to X doesn't work. I
don't understand enough about this area to submit a proper patch though,
so I just thought I'd let you know what change fixed the problem.
thanks -mike
On Fri, 2003-05-16 at 16:10, Mike Hearn wrote:
> > Yes I know what you talking about. Here is a patch for this. When I
> > presented it to Alexandre a while ago he said that it's not necessary
> > because X will take care of the clipping for us. He said we don't need
> > to do it.
>
> Thanks for the patch. I applied it, but other than the Google "I'm
> feeling lucky" buttons now appearing when i mouse over them, not much
> changed (clip_children is being called now though).
>
> Here's an excerpt from a trace:
>
> trace:x11drv:X11DRV_Expose win 0x10025 (4000009) 227,463 365x91
> trace:x11drv:X11DRV_Expose win 0x1002d (400002a) 227,0 365x40
> trace:x11drv:X11DRV_CreateBitmap (0xc18) 365x91 24 bpp
> trace:x11drv:X11DRV_GetDC visible=1
> trace:x11drv:clip_children called for parent=1002d, last=0
> trace:x11drv:get_visible_region top=0x1002a, win->hwndSelf=0x1002d
> trace:x11drv:get_visible_region WS_CLIPSIBLINGS for child
> trace:x11drv:clip_children called for parent=1002a, last=1002d
> trace:x11drv:clip_children one
> trace:x11drv:clip_children two
> trace:x11drv:get_visible_region WS_CLIPSIBLINGS for child
> trace:x11drv:clip_children called for parent=10029, last=1002a
> trace:x11drv:clip_children one
> trace:x11drv:clip_children two
>
> And the window tree looks like this:
>
> 10025 (main window - java renders buttons etc direct to it)
> |-10029 (start of IE embedding?)
> |- 1002A
> |- 1002D (this seems to be the IE rendering area)
> |-10026 (not sure what this is)
>
> So, As you can see Expose events are sent to the main window and the
> embedded IE window, which makes sense. I can see the clip_children call
> seemingly chaining up the window tree - it starts at 1002D and ends up
> at 10029 near the top, BUT for some reason clip_children is never called
> with a parent of 10025.
>
> I'm pretty lost in this code, I'm not sure how Java is even drawing - I
> switched off the blitting code and it mangled most Wine graphics in
> other apps, but Java was just like normal. But I think maybe
> clip_children should be called for the top level window?
>
> thanks a lot for you help Ulrich, it's appreciated!
> -mike
--
Mike Hearn <m.hearn(a)signal.qinetiq.com>
QinetiQ - Malvern Technology Center
Hi wine peeps,
Just wondering if Wine folks are implementing a chm viewer and if you would be
interested in a specification on the internal files of CHMs and even
relicencing some of the code for my chm decompiler.
all at http://bonedaddy.net/pabs3/hhm/
BTW; please cc me in replies since, while i'm subscribed i don't want to get
heaps of other wine discussion & so i've turned off mail delivery.
Bye,
Pabs
-------------------------------------------------
This mail sent through IMP: http://horde.org/imp/
Greetings,
Just wanted to point out that Ventrilo (www.ventrilo.com) works in wine with
abit of work. Although it requires 3 files (gsm 6.10 codec among other
things). The bug i'm left with currently is that when 2 people speak (at
same time), it freezes up.
Ventrilo will probobly make a linux version but wanted you all to know.
Best wishes
ps. Tribes still works =)
_________________________________________________________________
MSN 8 with e-mail virus protection service: 2 months FREE*
http://join.msn.com/?page=features/virus
Thanks Raphael for doing that, as I hadnt had chance to merge in your
changes.
BTW Did I read right that Alexander is away for 3 weeks...!
He'll have a nice workload when he gets back :-)
Jason
Hello,
I have been playing a bit with a installer what the
background appears above of the window what you must
press "NEXT>>", what you can't select. It worked only
using "Managed" = "No".
Changing the line:
dlls/x11drv/windows.c
inline static BOOL is_window_managed( WND *win )
{
if (!managed_mode) return FALSE;
/* tray window is always managed */
if (win->dwExStyle & WS_EX_TRAYWINDOW) return TRUE;
/* child windows are not managed */
if (win->dwStyle & WS_CHILD) return FALSE;
/* tool windows are not managed */
if (win->dwExStyle & WS_EX_TOOLWINDOW) return FALSE;
/* windows with caption or thick frame are managed */
if ((win->dwStyle & WS_CAPTION) == WS_CAPTION) return TRUE;
if (win->dwStyle & WS_THICKFRAME) return TRUE;
/* default: not managed */
return FALSE;
^^^^^^^^^^^^^^
with
return TRUE;
It is possible install (at least in my case) the program even
in managed mode.
Regards,
Carlos.
--
___ _ \ | / Consulting
| . |._ _ _| | ___ ___ ___ http://www.andago.com
| || ' |/ . |<_> |/ . |/ . \__ GNU/Linux
|_|_||_|_|\___|<___|\_. |\___/ _ \ __|\ \ /
Carlos A. Lozano <___'/ | \ -_) __/\__ \ > < -_)
[ carlos.lozano(a)andago.com ]\___|_| ____/ _/\_\___|
[ calb(a)epsxe.com ] http://www.ePSXe.com
