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

html browser for wine (khtml)

by Hetz Ben Hamo

Hi, Yesterday, Apple released their web browser - Safari. The license is LGPL and the code is based on KDE's KHTML rendering engine. Whats the difference? now you don't need QT, so license wise - it's kosher ;) Thanks, Hetz

Jan. 8, 2003

Re: wxWindows: it's official!

by Francois Gouget

On Tue, 7 Jan 2003, Dimitrie O. Paun wrote: [...] > Since program not using msvcrt expect only these funtions, > that's what we need to provide. I don't know what get_osfhandle(), > and setmode() are (they are not standard Unix functions), I've > added included only access(). get_osfhandle() takes a Windows file handle (HANDLE as returned by CreateFile) and returns a small int you can use with read, write, close, etc. setmode() lets you set the default file opening more: either TEXT (with LF -> CR/LF conversion) or BINARY (no conversion). I can see how get_osfhandle() can be useful for interoperability in Cygwin. setmode() seems of a more dubious value though (especially since it means they must have implemented the awful CR/LF conversion across their C library API (unless setmode() is nothing but a stub)). -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ 1 + e ^ ( i * pi ) = 0

Jan. 8, 2003

Re: wxWindows: it's official!

by Francois Gouget

On Wed, 8 Jan 2003, Dimitrie O. Paun wrote: [...] > Right -- I now see better where you guys come from. > > Now, thing is, cygwin does include io.h, and apps expect it. > You can make a good argument that it shouldn't, but it does. Note that I'm not completely opposed to to a new io.h header but it should not be directly in 'include'. Since it's specific for cygwin compatibility it should go in 'include/cygwin' where it will do no harm to other people. So people who want/need Cygwin compatibility would add -I/wherever/include/cygwin to the include path just like people who need msvcrt compatibility add -I/wherever/include/msvcrt. Now whether it is worth going to the trouble at this point I'm not convinced. Maybe if more headers surface. Btw, it clearly seems that Cygwin borrowed this header from msvcrt. So does it mean applications using this header are linking with the native Windows msvcrt library? Or did they replicate the msvcrt functionality in their C library? Did they borrow other msvcrt headers? -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Good judgment comes from experience, and experience comes from bad judgment -- Barry LePatner

Jan. 8, 2003

Re: Symbol stripping=?iso-8859-1?Q?=3F ?=

by Eric POUECH

> I submitted a patch which adds -gstabs to CFLAGS if necessary. I saw it ;-) you could have chosen -gstabs+ instead of -gstabs... winedbg will support it, and it's the default value for gcc 3.1 A+

Jan. 8, 2003

Re: Symbol stripping?

by Marcus Meissner

On Wed, Jan 08, 2003 at 08:59:39AM +0000, Mike Hearn wrote: > What does gcc prior to 3.1 do with the -gstabs+ flag? If it ignores it, > or it's implied anyway, we could just have it always on. > > If not then I have some bash here that can parse the output of gcc -v > and determine whether it's >= 3.1, would that be acceptable as a patch > to configure.ac? > > The only other way would be to compile a little test app then run > objdump on it to figure out if stabs data was included, but testing the > GCC version would be faster. I submitted a patch which adds -gstabs to CFLAGS if necessary. Ciao, Marcus

Jan. 8, 2003

Re: Help with /?? stuff

by Uwe Bonnes

>>>>> "Shachar" == Shachar Shemesh <arabeyes(a)sun.consumer.org.il> writes: Shachar> Hi list, Can someone please give me a good place to RTFM what Shachar> the !$&!% to do with paths that have /?? in them? Can I just Shachar> give them over to win32 functions, or do I need to do something Shachar> with them first? Shachar> Also, does anyone have any docs on "runonce.exe"? I have a very Shachar> vauge knowledge of what it does, and I could find -q -b Shachar> mentioned as command lines. Every function using the wine implementation of CreateFile should cope with a wide range of ways of writing the file path. So what did you do and what is your problem? Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

Jan. 8, 2003

Re: wxWindows: it's official!

by Alexandre Julliard

"Dimitrie O. Paun" <dpaun(a)rogers.com> writes: > I don't know much about their problem space, so I give them > the benefit of the doubt that they knew what they were doing. > In all honesty, I can also see a good argument for it being > in cygwin, but this is besides the point -- the file is there, > and apps depend on that. These apps are broken if they depend on io.h for access(). We cannot provide two different io.h in different directories, this will be a nightmare. We don't have to be 100% compatible with any random source out there; we are not 100% compatible with msvc either. What we need is to provide a way to write code that works both on Wine and on the original platform, so that once you have made it portable you don't need further changes. In this case the solution is unistd.h. -- Alexandre Julliard julliard(a)winehq.com

Jan. 8, 2003

Re: Possible bug (with fix) in MENU_FindItem()

by Duane Clark

Peter Gerwinski wrote: > Hello, > > while developing an application for WINE (also intended to run under > MSPOW = MicroSoft's Parody Of WINE, spoken "m-spow";-) I encountered > something which I consider a bug in WINE: > > When I invoke EnableMenuItem to enable/disable a menu item holding > a command with the numeric value 200, the first popup menu is > enabled/disabled instead of the menu item. (This behaviour does not > show up under MSPOW, version "ME".) > > IMHO this is due to a wrong order of two "if" conditions in > control/menu.c:MENU_FindItem(). > > I am attaching a patch which fixed the problem for me. Hi. Please submit to wine-patches. It will be unlikely to get into wine if submitted here.

Jan. 8, 2003

Re: _wine_ldt_copy can not be auto-imported when building under cygwin

by Dimitrie O. Paun

On January 8, 2003 02:33 am, Jeroen Janssen wrote: > The attached patch fixes the following problem: > > '_wine_ldt_copy' can't be auto-imported" when building under cygwin Jeroen, Can you please test if the attach patch work? Index: include/wine/library.h =================================================================== RCS file: /var/cvs/wine/include/wine/library.h,v retrieving revision 1.17 diff -u -r1.17 library.h --- include/wine/library.h 3 Jan 2003 03:12:58 -0000 1.17 +++ include/wine/library.h 8 Jan 2003 15:00:48 -0000 @@ -72,7 +72,16 @@ extern int wine_ldt_set_entry( unsigned short sel, const LDT_ENTRY *entry ); /* the local copy of the LDT */ -extern struct __wine_ldt_copy +#ifdef __CYGWIN__ +# ifdef WINE_EXPORT_LDT_COPY +# define WINE_LDT_EXTERN __declspec(dllexport) +# else +# define WINE_LDT_EXTERN __declspec(dllimport) +#else +# define WINE_LDT_EXTERN extern +#endif + +WINE_LDT_EXTERN struct __wine_ldt_copy { void *base[8192]; /* base address or 0 if entry is free */ unsigned long limit[8192]; /* limit in bytes or 0 if entry is free */ Index: library/ldt.c =================================================================== RCS file: /var/cvs/wine/library/ldt.c,v retrieving revision 1.5 diff -u -r1.5 ldt.c --- library/ldt.c 14 Aug 2002 21:10:50 -0000 1.5 +++ library/ldt.c 8 Jan 2003 14:56:31 -0000 @@ -28,6 +28,7 @@ #include <errno.h> #include "winbase.h" +#define WINE_EXPORT_LDT_COPY #include "wine/library.h" #ifdef __i386__ -- Dimi.

Jan. 8, 2003

[Fwd: dead keys treatment using XmbLookupString]

by Mauro Carvalho Chehab

Rikki, Please try to apply the following patch against the new CVS version (on /dlls/x11drv directory). This patch will allow keyboard.c to use your locale setting by the usage of xkb extension on X11R6. Please notice that this requires that you *don't have* xkbdisable on your XF86Config file (or XF86Config-4). -------- Original Message -------- Subject: dead keys treatment using XmbLookupString Date: Wed, 08 Jan 2003 12:48:06 -0200 From: Mauro Carvalho Chehab <mchehab(a)brturbo.com> To: wine-patches(a)winehq.com *Modifyied files*: keyboard.c window.c desktop.c *CVS Version*: 20021225 *Change Log: *Add dead key support using XmbLookupString on ToUnicode function, if *xkb* is available otherwise It falls back to the old code. The first Window will be used to define the XIC used by the functions. * Author*: Mauro Carvalho Chehab <mchehab(a)brturbo.com> ______________________________________________________________________________________________ --- keyboard.c 8 Jan 2003 11:24:51 -0000 1.1 +++ keyboard.c 8 Jan 2003 14:30:53 -0000 @@ -1389,6 +1389,44 @@ wine_tsx11_unlock(); } +#ifdef HAVE_XKB +static XIM xim = (XIM) NULL; +static XIC xic = (XIC) NULL; +#endif +/******************************************************************* + * KeyboardWindow (X11DRV.@) + * Called from desktop.c and window.c after Window creating + * This routine allows usage of XmbLookupString by ToUnicode. + * Only the first opened window will be used. It means that + * all windows will share the same locale. + * + */ +void X11DRV_KeyboardWindow (Display *display, Window w) +{ +#ifdef HAVE_XKB + char *p; + + if (xic) return; /* Only the first window will be used */ + + if ((p = XSetLocaleModifiers("")) != NULL && *p) + xim = XOpenIM(display, NULL, NULL, NULL); + if (!xim && (p = XSetLocaleModifiers("@im=none")) != NULL && *p) + xim = XOpenIM(display, NULL, NULL, NULL); + if (!xim) ERR_(key)( "Failed to open input method.\n"); + else { + xic = XCreateIC(xim, + XNInputStyle, XIMPreeditNothing | XIMStatusNothing, + XNClientWindow, w, + XNFocusWindow, w, + NULL); + if (!xic) { + ERR_(key)( "Failed to create input context.\n"); + XCloseIM(xim); + xim=NULL; + } + } +#endif +} /*********************************************************************** * X11DRV_MappingNotify @@ -1741,6 +1779,7 @@ * FIXME : should do the above (return 2 for non matching deadchar+char combinations) * */ + INT X11DRV_ToUnicode(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, LPWSTR bufW, int bufW_size, UINT flags) { @@ -1756,6 +1795,9 @@ TRACE("Key UP, doing nothing\n" ); return 0; } + memset (&e,0,sizeof(e)); + + e.type = KeyPress; e.display = display; e.keycode = 0; e.state = 0; @@ -1814,7 +1856,15 @@ } else TRACE("Found keycode %d (0x%2X)\n",e.keycode,e.keycode); - ret = XLookupString(&e, (LPVOID)lpChar, 2, &keysym, NULL); +#ifdef HAVE_XKB + if (xic) { + ret = XmbLookupString(xic,&e, (LPVOID)lpChar, sizeof(lpChar), &keysym, NULL); + } else { + ret = XLookupString(&e, (LPVOID)lpChar, sizeof(lpChar), &keysym, NULL); + } +#else + ret = XLookupString(&e, (LPVOID)lpChar, sizeof(lpChar), &keysym, NULL); +#endif wine_tsx11_unlock(); if (ret == 0) --- window.c 8 Jan 2003 11:24:51 -0000 1.1 +++ window.c 8 Jan 2003 14:30:53 -0000 @@ -43,6 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); extern Pixmap X11DRV_BITMAP_Pixmap( HBITMAP ); +extern X11DRV_KeyboardWindow (Display *display, Window w); #define HAS_DLGFRAME(style,exStyle) \ (((exStyle) & WS_EX_DLGMODALFRAME) || \ @@ -199,6 +200,7 @@ CWEventMask | CWBitGravity | CWBackingStore | CWColormap, &attr ); XSaveContext( display, data->icon_window, winContext, (char *)win->hwndSelf ); wine_tsx11_unlock(); + if (data->client_window) X11DRV_KeyboardWindow (display, data->whole_window); TRACE( "created %lx\n", data->icon_window ); SetPropA( win->hwndSelf, icon_window_atom, (HANDLE)data->icon_window ); @@ -686,6 +688,7 @@ wine_tsx11_unlock(); return 0; } + X11DRV_KeyboardWindow (display, data->whole_window); /* non-maximized child must be at bottom of Z order */ if ((win->dwStyle & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD) @@ -732,6 +735,7 @@ CWEventMask | CWBitGravity | CWBackingStore, &attr ); if (data->client_window && is_client_window_mapped( win )) XMapWindow( display, data->client_window ); + if (data->client_window) X11DRV_KeyboardWindow (display, data->whole_window); wine_tsx11_unlock(); return data->client_window; } --- desktop.c 8 Jan 2003 11:24:51 -0000 1.1 +++ desktop.c 8 Jan 2003 14:30:53 -0000 @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +extern X11DRV_KeyboardWindow (Display *display, Window w); /* desktop window procedure */ static LRESULT WINAPI desktop_winproc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) @@ -141,6 +142,8 @@ win = XCreateWindow( display, DefaultRootWindow(display), x, y, width, height, 0, screen_depth, InputOutput, visual, CWBackPixel | CWEventMask | CWCursor | CWColormap, &win_attr ); + + if (win) X11DRV_KeyboardWindow (display, win); /* Set window manager properties */ size_hints = XAllocSizeHints();

Jan. 8, 2003