wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

qcap/avicap and driver models
by Maarten Lankhorst 24 May '05

24 May '05

Hi Alexandre, I implemented a driver model in qcap now, but avicap32 still uses my old #ifdef LINUX_VIDEODEV_H, since some people might be interested in writing capcreatecapturewindow, I think we should move out the drivers from qcap to our own vfwwine dll/driver, windows uses a similar model for it, as rolf kalbermatter pointed out in http://www.winehq.com/?issue=274#Video%20Capture%20in%20Windows For the qcap drivers, I used some kind of COM model typedef struct capturefunctions { ... Video_SetMediaType SetFormat; ... void *pMine; } Capture; First, it tries to initialise, and lets the constructor function fill this struct, then if something is needed, it just calls Capture->SetFormat(Capture->pMine, parameters..), this is the qcap implementation, but I'm sure that if I write some parts of it so it will be DirectShow indepent, it can be used by avicap and qcap, I'm not really interested in avicap, but in the very least capgetdriverdescription should use the same code as qcap, because writing the same twice would mean a huge overhead. So basically, I'm just wondering what to do, should I go ahead with the seperate driver dll or should I do something else? Maarten

3 2

Re: [dbghelp] dwarf2 support progress step 5
by Pouech Eric DMI AEI CAEN 24 May '05

24 May '05

> > > > Changelog: > > - implement dwarf2_find_symt_by_ref and dwarf2_add_symt_ref using hashtables > > - some debug lines defines > > - handle forwards references (ie dwarf2_find_symt_by_ref returns NULL) using > > ref hashtable > > - better traces > > It doesn't compile, you probably forgot part of the diff: > > elf_module.c: In function `elf_load_debug_info_from_map': > elf_module.c:901: too few arguments to function `dwarf2_parse' > make: *** [elf_module.o] Error 1 I also would like to review in details the patch (especially why we need to change the inner interfaces in types.c and symbol.c) [there are forward declarations in MSC and stabs parsing and we don't need the hack included here] A+

1 0

Re: [RESENT] MSVCRT: Lower Error level of _spawnve
by Alexandre Julliard 24 May '05

24 May '05

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes: > @@ -448,7 +448,9 @@ > const char *fullname = name; > int ret = -1; > > - FIXME(":not translating name %s to locate program\n",fullname); > + /* Is this really a WARN? Native msvcrt doesn't seem to translate the argumentsd neither > + bon(a)elektron.ikp.physik.tu-darmstadt.de 050516 */ > + WARN(":not translating name %s to locate program\n",fullname); Yes, native does transformations on the program name, like looking for .bat, .cmd etc. if there is no extension. That FIXME should remain until this is fixed properly. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: winedump: Print file offset instead of obscure 'prefix' while dumping data
by Pouech Eric DMI AEI CAEN 24 May '05

24 May '05

> > > Print file offset instead of obscure 'prefix' while dumping data. > > prefix is used to properly indent the output of the dump, so you do want to keep > > the prefix (this doesn't prevent you from adding the offsets for dumps) > > The offset is going to replace the prefix, not to coexist with it. > Are you objecting to it? yes, you're loosing the identation of the data-dump that prefix provided A+

1 0

Bug 2660
by Dustin Navea 24 May '05

24 May '05

This is more directed toward Jason, but I figure everyone should see it. As comments 9-11 note in this bug, the notes mentioned in http://www.winehq.org/hypermail/wine-devel/2005/05/0420.html and the resulting patch that was attached to the bug do fix the problem. I'm not sure if the patch has been committed to CVS, but if it hasn't it probably should before the next wine release... If it has, please post a note to the bug and I will resolve it, referencing to get the next wine release when it comes out, or CVS if someone can't wait.. Dustin

4 3

XEmbed embeder support in Wine
by Jacek Caban 24 May '05

24 May '05

Hello. As I'm working on getting MSHTML to work using Linux Gecko, I need support of XEmbed embedding in Wine. It can be also useful for Winelib applications (and maybe in future for some other parts of Wine) to show the X11 windows in Wine. My current version of XEmbed patch and a simple test application that creates gtk button inside Wine window is attached. Using this patch I can display Gecko in the Wine window (now only in my test application, but I'm working on integrating it with MSHTML). The way I want to do it is: 1. Wine application creates window of "_XEMBED" class 2. Embedding window can be done in two ways (as in specification): - Wine application sends _WM_ATTACH_WINDOW message passing X11 Window (not yet implemented) or - Client window is created as a child window of Wine window 3. Window is displayed and Wine communicates with X11 window using XEmbed protocol I know my patch needs some polishing and more implementations (focus, activating, handling unmapping of window....), but I'd like to know if the way I do it is proper? What needs to be done for the first patch to be accepted? Thanks, Jacek ? dlls/x11drv/diff ? dlls/x11drv/xembed.c Index: dlls/x11drv/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/x11drv/Makefile.in,v retrieving revision 1.43 diff -u -p -r1.43 Makefile.in --- dlls/x11drv/Makefile.in 6 May 2005 19:38:50 -0000 1.43 +++ dlls/x11drv/Makefile.in 23 May 2005 19:26:25 -0000 @@ -40,6 +40,7 @@ C_SRCS = \ xdnd.c \ xfont.c \ xim.c \ + xembed.c \ xrandr.c \ xrender.c \ xvidmode.c Index: dlls/x11drv/event.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/event.c,v retrieving revision 1.54 diff -u -p -r1.54 event.c --- dlls/x11drv/event.c 24 Mar 2005 20:41:28 -0000 1.54 +++ dlls/x11drv/event.c 23 May 2005 19:26:27 -0000 @@ -98,7 +98,7 @@ static struct event_handler handlers[MAX /* GraphicsExpose */ /* NoExpose */ /* VisibilityNotify */ - /* CreateNotify */ + { CreateNotify, X11DRV_CreateNotify }, /* DestroyNotify */ { UnmapNotify, X11DRV_UnmapNotify }, { MapNotify, X11DRV_MapNotify }, @@ -875,7 +875,6 @@ static void handle_dnd_protocol( HWND hw EVENT_DropURLs(hwnd, event); } - struct client_message_handler { int atom; /* protocol atom */ @@ -889,7 +888,8 @@ static const struct client_message_handl { XATOM_XdndEnter, X11DRV_XDND_EnterEvent }, { XATOM_XdndPosition, X11DRV_XDND_PositionEvent }, { XATOM_XdndDrop, X11DRV_XDND_DropEvent }, - { XATOM_XdndLeave, X11DRV_XDND_LeaveEvent } + { XATOM_XdndLeave, X11DRV_XDND_LeaveEvent }, + { XATOM__XEMBED, X11DRV_XEmbed_protocol } }; Index: dlls/x11drv/window.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/window.c,v retrieving revision 1.108 diff -u -p -r1.108 window.c --- dlls/x11drv/window.c 26 Apr 2005 08:16:17 -0000 1.108 +++ dlls/x11drv/window.c 23 May 2005 19:26:28 -0000 @@ -97,6 +97,8 @@ static const char * const atom_names[NB_ "XdndSelection", "XdndTarget", "XdndTypeList", + "_XEMBED", + "_XEMBED_INFO", "WCF_DIB", "image/gif", "text/html", @@ -183,7 +185,8 @@ static int get_window_attributes( struct attr->event_mask = (ExposureMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask | KeyPressMask | KeyReleaseMask | StructureNotifyMask | - FocusChangeMask | KeymapStateMask); + FocusChangeMask | KeymapStateMask | + SubstructureNotifyMask); return (CWOverrideRedirect | CWSaveUnder | CWEventMask | CWColormap | CWCursor); } Index: dlls/x11drv/x11drv.h =================================================================== RCS file: /home/wine/wine/dlls/x11drv/x11drv.h,v retrieving revision 1.72 diff -u -p -r1.72 x11drv.h --- dlls/x11drv/x11drv.h 21 Apr 2005 17:31:50 -0000 1.72 +++ dlls/x11drv/x11drv.h 23 May 2005 19:26:28 -0000 @@ -288,6 +288,9 @@ extern void X11DRV_XDND_PositionEvent( H extern void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ); extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ); +extern void X11DRV_XEmbed_protocol(HWND, XClientMessageEvent*); +extern void X11DRV_XEmbed_Init(); + /* exported dib functions for now */ /* DIB Section sync state */ @@ -586,6 +589,8 @@ enum x11drv_atoms XATOM_XdndSelection, XATOM_XdndTarget, XATOM_XdndTypeList, + XATOM__XEMBED, + XATOM__XEMBED_INFO, XATOM_WCF_DIB, XATOM_image_gif, XATOM_text_html, @@ -621,6 +626,7 @@ extern void X11DRV_MappingNotify( HWND h extern void X11DRV_DGAMotionEvent( HWND hwnd, XEvent *event ); extern void X11DRV_DGAButtonPressEvent( HWND hwnd, XEvent *event ); extern void X11DRV_DGAButtonReleaseEvent( HWND hwnd, XEvent *event ); +extern void X11DRV_CreateNotify( HWND hwnd, XEvent *event ); extern DWORD EVENT_x11_time_to_win32_time(Time time); Index: dlls/x11drv/x11drv_main.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/x11drv_main.c,v retrieving revision 1.103 diff -u -p -r1.103 x11drv_main.c --- dlls/x11drv/x11drv_main.c 21 Apr 2005 17:31:50 -0000 1.103 +++ dlls/x11drv/x11drv_main.c 23 May 2005 19:26:29 -0000 @@ -384,6 +384,9 @@ static BOOL process_attach(void) X11DRV_InitKeyboard(); + /* initialize XEmbed */ + X11DRV_XEmbed_Init(); + return TRUE; } @@ -483,7 +486,6 @@ struct x11drv_thread_data *x11drv_init_t if (desktop_tid) AttachThreadInput( GetCurrentThreadId(), desktop_tid, TRUE ); return data; } - /*********************************************************************** * X11DRV initialisation routine ? dlls/user/diff Index: dlls/user/user_main.c =================================================================== RCS file: /home/wine/wine/dlls/user/user_main.c,v retrieving revision 1.83 diff -u -p -r1.83 user_main.c --- dlls/user/user_main.c 6 May 2005 19:38:50 -0000 1.83 +++ dlls/user/user_main.c 23 May 2005 19:26:39 -0000 @@ -260,6 +260,9 @@ static BOOL process_attach(void) /* some Win9x dlls expect keyboard to be loaded */ if (GetVersion() & 0x80000000) LoadLibrary16( "keyboard.drv" ); + /* Initialize built-in window classes */ + CLASS_RegisterBuiltinClasses(); + /* Load the graphics driver */ if (!load_driver()) return FALSE; @@ -268,9 +271,6 @@ static BOOL process_attach(void) /* Setup palette function pointers */ palette_init(); - - /* Initialize built-in window classes */ - CLASS_RegisterBuiltinClasses(); /* Initialize menus */ if (!MENU_Init()) return FALSE; --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ dlls/x11drv/xembed.c 2005-05-23 21:23:42.000000000 +0200 @@ -0,0 +1,385 @@ +/* + * Copyright 2005 Jacek Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <X11/Xlib.h> + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +#include "x11drv.h" + +#define XEMBED_EMBEDDED_NOTIFY 0 +#define XEMBED_WINDOW_ACTIVATE 1 +#define XEMBED_WINDOW_DEACTIVATE 2 +#define XEMBED_REQUEST_FOCUS 3 +#define XEMBED_FOCUS_IN 4 +#define XEMBED_FOCUS_OUT 5 +#define XEMBED_FOCUS_NEXT 6 +#define XEMBED_FOCUS_PREV 7 +#define XEMBED_MODALITY_ON 10 +#define XEMBED_MODALITY_OFF 11 +#define XEMBED_REGISTER_ACCELERATOR 12 +#define XEMBED_UNREGISTER_ACCELERATOR 13 +#define XEMBED_ACTIVATE_ACCELERATOR 14 + +#define XEMBED_FOCUS_CURRENT 0 +#define XEMBED_FOCUS_FIRST 1 +#define XEMBED_FOCUS_LAST 2 + +#define XEMBED_MAPPED 1 + +#define _WM_ATTACH_WINDOW WM_USER+600 + +WINE_DEFAULT_DEBUG_CHANNEL(xembed); + +typedef struct wnd_list_t { + HWND hwnd; + struct wnd_list_t *next; +} wnd_list_t; + +static wnd_list_t *wnd_list = NULL; + +static void wnd_list_add(HWND hwnd) +{ + wnd_list_t *new = HeapAlloc(GetProcessHeap(), 0, sizeof(wnd_list_t)); + new->hwnd = hwnd; + new->next = wnd_list; + wnd_list = new; +} + +static void wnd_list_remove(HWND hwnd) +{ + wnd_list_t *iter = wnd_list; + + if(!iter) + return; + + if(iter->hwnd == hwnd) { + wnd_list = iter->next; + HeapFree(GetProcessHeap(), 0, iter); + }else { + while(iter->next && iter->next->hwnd != hwnd) + iter = iter->next; + if(iter->next) { + wnd_list_t *tmp = iter->next; + iter->next = tmp->next; + HeapFree(GetProcessHeap(), 0, tmp); + } + } +} + +BOOL check_xembed_info(Display *display, Window win, unsigned long *version, long unsigned *flags) +{ + Atom type; + int format, res; + unsigned long nitems, bytes_after, *data; + + wine_tsx11_lock(); + res = XGetWindowProperty(display, win, x11drv_atom(_XEMBED_INFO), 0, 2, False, + x11drv_atom(_XEMBED_INFO), &type, &format, &nitems, &bytes_after, (unsigned char**)&data); + wine_tsx11_unlock(); + + if(res != Success || !format) { + TRACE("Could not get _XEMBED_INFO\n"); + XFree(data); + return FALSE; + } + + *version = data[0]; + *flags = data[1]; + + XFree(data); + + TRACE("got version=%08lx flags=%08lx\n", *version, *flags); + return TRUE; +} + +static void xembed_client_show(Display *display, HWND hwnd, BOOL show) +{ + Window window = (Window)GetPropA(hwnd, "__wine_x11_client_window"); + + TRACE("(%p %p %x) window=%08lx\n", display, hwnd, show, window); + + if(!window) + return; + + if(!display) + display = ((struct x11drv_thread_data*)NtCurrentTeb()->driver_data)->display; + + wine_tsx11_lock(); + if(show) + XMapWindow(display, window); + else + XUnmapWindow(display, window); + wine_tsx11_unlock(); +} + +static void xembed_client_set_position(Display *display, HWND hwnd) +{ + Window window = (Window)GetPropA(hwnd, "__wine_x11_client_window"); + HWND parent = (HWND)GetPropA(hwnd, "__wine_x11_embedder_window_hwnd"); + WINDOWINFO wininfo, parent_wininfo; + + TRACE("(%p %p) window=%08lx, parent=%p\n", display, hwnd, window, parent); + + if(!window) + return; + + if(!display) + display = ((struct x11drv_thread_data*)NtCurrentTeb()->driver_data)->display; + + wininfo.cbSize = sizeof(WINDOWINFO); + parent_wininfo.cbSize = sizeof(WINDOWINFO); + GetWindowInfo(hwnd, &wininfo); + GetWindowInfo(parent, &parent_wininfo); + + wine_tsx11_lock(); + XMoveWindow(display, window, + wininfo.rcClient.left - parent_wininfo.rcClient.left, + wininfo.rcClient.top - parent_wininfo.rcClient.top); + wine_tsx11_unlock(); +} + +static void xembed_client_set_size(Display *display, HWND hwnd) +{ + Window window = (Window)GetPropA(hwnd, "__wine_x11_client_window"); + RECT rect; + + TRACE("(%p %p) window=%08lx\n", display, hwnd, window); + + if(!window) + return; + + if(!display) + display = ((struct x11drv_thread_data*)NtCurrentTeb()->driver_data)->display; + + GetClientRect(hwnd, &rect); + + wine_tsx11_lock(); + XResizeWindow(display, window, rect.right, rect.bottom); + wine_tsx11_unlock(); +} + +static void send_xembed_event(Display *display, Window window, int message, + unsigned long detail, unsigned long data1, unsigned long data2) +{ + XClientMessageEvent event; + + event.type = ClientMessage; + event.window = window; + event.message_type = x11drv_atom(_XEMBED); + event.format = 32; + event.data.l[0] = 0; /* FIXME */ + event.data.l[1] = message; + event.data.l[2] = detail; + event.data.l[3] = data1; + event.data.l[4] = data2; + + wine_tsx11_lock(); + XSendEvent(display, window, False, NoEventMask, (XEvent*)&event); + wine_tsx11_unlock(); +} + +static LRESULT attach_window(HWND hwnd, Window window) { + struct x11drv_thread_data *data = NtCurrentTeb()->driver_data; + unsigned long version = 0, flags = XEMBED_MAPPED; + + TRACE("(%p %lx)\n", hwnd, window); + + SetPropA(hwnd, "__wine_x11_client_window", (LPVOID)window); + + check_xembed_info(data->display, window, &version, &flags); + + /* FIXME: handle XEmbed version correctly (until there is only version 0 it's not really important) */ + send_xembed_event(data->display, window, XEMBED_EMBEDDED_NOTIFY, 0, + (Window)GetPropA(hwnd, "__wine_x11_embedder_window"), 0); + + if(!(flags & XEMBED_MAPPED)) { + unsigned int prop[] = {0, XEMBED_MAPPED}; + XChangeProperty(data->display, window, x11drv_atom(_XEMBED_INFO), + XA_CARDINAL, 32, PropModeReplace, + (unsigned char*)prop, 2); + } + + xembed_client_set_position(data->display, hwnd); + xembed_client_set_size(data->display, hwnd); + + if(IsWindowVisible(hwnd)) + xembed_client_show(data->display, hwnd, TRUE); + + send_xembed_event(data->display, window, XEMBED_WINDOW_ACTIVATE, 0, 0, 0); + send_xembed_event(data->display, window, XEMBED_FOCUS_IN, XEMBED_FOCUS_FIRST, 0, 0); + + return 0; +} + +HWND find_hwnd_for_window(Window parent) +{ + wnd_list_t *iter; + + TRACE("(%08lx)\n", parent); + + /* + * FIXME: + * We attach the window to the first HWND on the list. It would be better + * to have some kind of a filter (callback function or a message to parent?) + * determining which HWND to select. + */ + for(iter = wnd_list; iter; iter = iter->next) { + if(!GetPropA(iter->hwnd, "__wine_x11_client_window") + && (Window)GetPropA(iter->hwnd, "__wine_x11_embedder_window") == parent) + break; + } + + if(!iter) { + WARN("Not found embedder window\n"); + return NULL; + } + + TRACE("Fount hwnd %p\n", iter->hwnd); + return iter->hwnd; +} + +/********************************************************************** + * X11DRV_CreateNotify + */ +void X11DRV_CreateNotify(HWND hwnd, XEvent *event) +{ + HWND embed_hwnd; + + TRACE("(%p %p) window = %lx\n", hwnd, event, event->xcreatewindow.window); + + embed_hwnd = find_hwnd_for_window(event->xcreatewindow.parent); + if(embed_hwnd) + attach_window(embed_hwnd, event->xcreatewindow.window); +} + +/********************************************************************** + * X11DRV_XEmbed_protocol + */ +void X11DRV_XEmbed_protocol(HWND hwnd, XClientMessageEvent *event) { + switch(event->data.l[1]) { + case XEMBED_EMBEDDED_NOTIFY: + TRACE("XEMBED_EMBEDDED_NOTIFY\n"); + break; + case XEMBED_WINDOW_ACTIVATE: + TRACE("XEMBED_WINDOW_ACTIVATE\n"); + break; + case XEMBED_WINDOW_DEACTIVATE: + TRACE("XEMBED_WINDOW_DEACTIVATE\n"); + break; + case XEMBED_REQUEST_FOCUS: + TRACE("XEMBED_REQUEST_FOCUS\n"); + break; + case XEMBED_FOCUS_IN: + TRACE("XEMBED_FOCUS_IN\n"); + break; + case XEMBED_FOCUS_OUT: + TRACE("XEMBED_FOCUS_OUT\n"); + break; + case XEMBED_FOCUS_NEXT: + TRACE("XEMBED_FOCUS_NEXT\n"); + break; + case XEMBED_FOCUS_PREV: + TRACE("XEMBED_FOCUS_PREV\n"); + break; + case XEMBED_MODALITY_ON: + TRACE("XEMBED_MODALITY_ON\n"); + break; + case XEMBED_MODALITY_OFF: + TRACE("XEMBED_MODALITY_OFF\n"); + break; + case XEMBED_REGISTER_ACCELERATOR: + TRACE("XEMBED_REGISTER_ACCELERATOR\n"); + break; + case XEMBED_UNREGISTER_ACCELERATOR: + TRACE("XEMBED_UNREGISTER_ACCELERATOR\n"); + break; + case XEMBED_ACTIVATE_ACCELERATOR: + TRACE("XEMBED_ACTIVATE_ACCELERATOR\n"); + break; + }; +} + +/********************************************************************** + * XEmbed_WndProc + */ +static LRESULT WINAPI XEmbed_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + case WM_CREATE: { + HWND parent; + Window window; + + TRACE("(%p) WM_CREATE\n", hwnd); + parent = hwnd; + + while(!(window = (Window)GetPropA(parent, "__wine_x11_whole_window"))) + parent = GetParent(parent); + + TRACE("x11 window = %08lx\n", window); + + SetPropA(hwnd, "__wine_x11_embedder_window", (LPVOID)window); + SetPropA(hwnd, "__wine_x11_embedder_window_hwnd", (LPVOID)parent); + wnd_list_add(hwnd); + break; + } + case WM_DESTROY: + TRACE("(%p) WM_DESTROY\n", hwnd); + wnd_list_remove(hwnd); + break; + case WM_SHOWWINDOW: + xembed_client_show(NULL, hwnd, wParam); + break; + case WM_MOVE: + xembed_client_set_position(NULL, hwnd); + break; + case WM_SIZE: + xembed_client_set_size(NULL, hwnd); + break; + case _WM_ATTACH_WINDOW: + WARN("_WM_ATTACH_WINDOW\n"); + }; + + return DefWindowProcW(hwnd, msg, wParam, lParam); +} + +/********************************************************************** + * X11DRV_XEmbed_Init + */ +void X11DRV_XEmbed_Init() +{ + static const WCHAR wszXEMBED[] = {'_','X','E','M','B','E','D',0}; + static WNDCLASSEXW wndclass = { + sizeof(WNDCLASSEXW), + 0, + XEmbed_WndProc, + 0, 0, NULL, NULL, NULL, NULL, NULL, + wszXEMBED, + NULL + }; + + TRACE("()\n"); + + RegisterClassExW(&wndclass); +} #include <assert.h> #include <unistd.h> #include <stdio.h> #include <gtk/gtk.h> #include <gdk/gdkx.h> #include <windows.h> static GdkNativeWindow xwindow; static HINSTANCE hInst; static DWORD WINAPI make_plug(LPVOID arg) { GtkWidget *plug, *button; assert(xwindow); gtk_init(NULL, NULL); plug = gtk_plug_new(xwindow); assert(plug); gtk_widget_show(plug); button = gtk_button_new(); gtk_container_add((GtkContainer*)plug, button); gtk_widget_show(button); gtk_main(); } static LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { case WM_CREATE: xwindow = (GdkNativeWindow)GetPropA(hwnd, "__wine_x11_whole_window"); HWND xembed_hwnd = CreateWindowExA(0, "_XEMBED", NULL, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 300, 300, hwnd, NULL, hInst, NULL); ShowWindow(xembed_hwnd, TRUE); xwindow = (GdkNativeWindow)GetPropA(xembed_hwnd, "__wine_x11_embedder_window"); CreateThread(NULL, 0, make_plug, NULL, 0, NULL); break; case WM_DESTROY: PostQuitMessage(0); break; } return DefWindowProc(hwnd, msg, wParam, lParam); } int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) { MSG msg; HWND hwnd; static char appName[] = "XEmbed Test"; WNDCLASSEX wndclass; if(!hPrevInst) { hInst = hInstance; wndclass.cbSize = sizeof(wndclass); wndclass.style = CS_HREDRAW | CS_VREDRAW; wndclass.lpfnWndProc = WndProc; wndclass.cbClsExtra = 0; wndclass.cbWndExtra = 0; wndclass.hInstance = hInstance; wndclass.hIcon = LoadIcon(NULL,IDI_APPLICATION); wndclass.hCursor = LoadCursor(NULL,IDC_ARROW); wndclass.hbrBackground = 0; wndclass.lpszMenuName = NULL; wndclass.lpszClassName = appName; wndclass.hIconSm = LoadIcon(NULL,IDI_APPLICATION); if(!RegisterClassEx(&wndclass)) return FALSE; } hwnd = CreateWindow(appName, appName, WS_OVERLAPPEDWINDOW, 0, 0, 300, 300, NULL, NULL, hInstance, NULL); assert(hwnd); ShowWindow(hwnd,cmdshow); while(GetMessage(&msg,NULL,0,0)) { TranslateMessage(&msg); DispatchMessage(&msg); } return msg.wParam; }

2 2

[RESEND] commdlg: use shell32's ILGetDisplayName instead of SHGetPathFromIDList
by Michael Jung 24 May '05

24 May '05

Hi Alexandre, could you please give a short comment on this one: http://www.winehq.org/hypermail/wine-patches/2005/05/0533.html Thanks, -- Michael Jung mjung(a)iss.tu-darmstadt.de

2 1

Re: Corrected the determination of capturing inside EDIT_WM_MouseMove function.
by Dimitrie Paun 24 May '05

24 May '05

> Corrected the determination of capturing inside EDIT_WM_MouseMove function. > - if (GetCapture() != es->hwndSelf) > + if (GetCapture() != es->hwndSelf || !es->bCaptureState) Can we have GetCapture() == es->hwndSelf && !es->bCaptureState If so, isn't this an invalid state? How do we get there? -- Dimi.

2 5

Change of email addr?
by Ann and Jason Edmeades 24 May '05

24 May '05

Hiya, Is there any way to change the email address I am registered with for the wine mailing lists, bug tracking, Changelog etc, or is the best way just to reregister for them all with a different id? Jason

3 2

Write problem with MS Office 2003
by Stefan Dösinger 23 May '05

23 May '05

Hello, I'm doing a few test with Microsoft Office 2003, and one of the problems I notice is that any app(word, excel, powerpoint, access tested) refuses to save new files. Whenever I try to save a file Office tells me that the folder is write-protected. Opening an existing file and saving it again works. I looked at a +shell log and 2 interesting lines are: trace:shell:IShellFolder_fnGetAttributesOf (0x77c403a0)->(cidl=0 apidl=(nil) mask=0x77a820fc (0x00040000)) trace:shell:IShellFolder_fnGetAttributesOf -- result=0x00040000 The result 0x00040000 means SFGAO_READONLY, which the folder isn't, I veryfied that I can write it. As far as I understand Office tries to read the SFGAO_READONLY attribute passing 0x00040000 rgfInOut. But cidl and apidl are set to 0, so Wine's IShellFolder_fnGetAttributesOf doesn't check anything and just returns SFGAO_READONLY. There's a check for this case: if (cidl && !apidl) return E_INVALIDARG; MSDN doesn't give me a hint what to do if cidl is set to 0. If I change the if line to "if (!cidl && !apidl)" (so E_INVALIDARG is returned to office), saving the file works. Should this line be "if (!cidl || !apidl)", or is there a special case for cidl==0? Stefan

1 0

rundll32.exe - interface: SHHelpShortcuts_RunDLL
by Detlef Riekenberg 23 May '05

23 May '05

Hi. While implementing this Functions, I have some Question for the Interface of: shell32.dll SHHelpShortcuts_RunDLL* 1. HWND hwnd 2. DWORD dwArg2 3. LTCSTR szCommand / LPCWSTR wszCommand 4. DWORD dwArg4 Question for 2: What is this Parameter for? (Seems to always be 0x77d8000. => last ptr for winvdm.exe) Question for 3: What Parameter / Which Commands did you knew? FontsFolder PrintersFolder AddPrinter PrintTestPage Connect Disconnect Question for 4: What is this Flags-Parameter for? (Seems to always be 0xa.) -- By By ... ... Detlef

2 2

Re: Write problem with MS Office 2003
by Juan Lang 23 May '05

23 May '05

Stefan wrote: > There's a check for this case: > if (cidl && !apidl) > return E_INVALIDARG; > > MSDN doesn't give me a hint what to do if cidl is set to 0. If I > change the if line to "if (!cidl && !apidl)" (so E_INVALIDARG is > returned to office), saving the file works. Should this line be > "if (!cidl || !apidl)", or is there a special case for cidl==0? There is a special case for cidl == 0, some apps expect to be able to call GetAttributesOf with cidl == 0, apidl == NULL. See the patch that introduced it here: http://www.winehq.org/hypermail/wine-patches/2005/05/0156.html The special case, in particular, is to handle SFGAO_VALIDATE, described on the MSDN page for IShellFolder::GetAttributesOf. I'm guessing this bit is what the app writers were reading when they decided to call GetAttributesOf with cidl == 0: "When used with the file system folder, SFGAO_VALIDATE instructs the folder to discard cached properties retrieved by clients of IShellFolder2::GetDetailsEx that may have accumulated for the specified items." The correct fix is to modify SHELL32_GetItemAttributes to clear SFGAO_READONLY if the file is not read-only. --Juan __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new Resources site http://smallbusiness.yahoo.com/resources/

1 0

Re: Blame ExpandEnvironmentStringsA for the failing NT4 test in shlwapi:shreg
by Alexandre Julliard 23 May '05

23 May '05

Richard Cohen <richard(a)daijobu.co.uk> writes: > This is failing because ExpandEnvironmentStringsA is returning twice > the number of characters it should. > > I would like to mark this test (and some others) as todo(nt40), but > the testing framework isn't flexible enough to let me do that (the > only real options seem to be "wine" and "windows"). > > Would a patch to extend the framework to allow a bit mask, something > like todo(win9x|winxp), be acceptable? A todo is supposed to mark something that will need to be addressed later on. Obviously we can't fix the Windows code, so that's not a todo, it's just a behavior of the API that should either be handled by the test, or simply not tested at all if the results are not reliable. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: install launcher for taskmgr
by Alexandre Julliard 23 May '05

23 May '05

Brian Vincent <vinn(a)theshell.com> writes: > like msiexec, taskmgr didn't have have a launcher script It's really a namespace issues, we don't want to pollute the global /usr/bin with more apps than strictly necessary. Unlike msiexec, taskmgr isn't Windows-specific enough IMO to export it this way. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Fix Sparse Warnings for server/
by Alexandre Julliard 23 May '05

23 May '05

Robert Shearman <rob(a)codeweavers.com> writes: > Changelog: > Fix sparse warnings. sparse should be taught that 0 is a perfectly fine value (and IMO preferable to NULL) for handles. -- Alexandre Julliard julliard(a)winehq.org

3 3

RESEND: Get AdjustWindowRect working better
by Richard Cohen 23 May '05

23 May '05

Richard Cohen wrote: > >> This fixes a longstanding bug whereby winemine would move 1 pixel down >> the screen for every new game. >> > Changelog: - Fix off-by-one in menu height calculation (& therefore AdjustWindowRect) + test

1 0

RASENH and Crypt Functions and ADVAPI32
by Uwe Bonnes 23 May '05

23 May '05

Michael, comments in rsaenh show that you duplicated code from advapi32. With SystemFunction036 there is another duplicated functionality. Is there any reason why you don't use the advapi functions direct? Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

2 1

Re: winedump: Print file offset instead of obscure 'prefix' while dumping data
by Eric Pouech 23 May '05

23 May '05

Dmitry Timoshkov a écrit : > Hello, > > Changelog: > Dmitry Timoshkov <dmitry(a)codeweavers.com> > Print file offset instead of obscure 'prefix' while dumping data. prefix is used to properly indent the output of the dump, so you do want to keep the prefix (this doesn't prevent you from adding the offsets for dumps) A+ -- Eric Pouech

2 1

Re: urlmon: Prevent possible use of freed memory
by Jacek Caban 22 May '05

22 May '05

Troy Rollo wrote: >This fixes Bugzilla bug 2969 <http://bugs.winehq.org/show_bug.cgi?id=2969> > >ChangeLog: > Prevent a URLMonikerImpl from being freed before its work in > BindToStorage is done. > > >------------------------------------------------------------------------ > >Index: dlls/urlmon/umon.c >=================================================================== >RCS file: /home/wine/wine/dlls/urlmon/umon.c,v >retrieving revision 1.52 >diff -u -r1.52 umon.c >--- dlls/urlmon/umon.c 5 May 2005 09:50:46 -0000 1.52 >+++ dlls/urlmon/umon.c 21 May 2005 23:57:36 -0000 >@@ -456,6 +456,13 @@ > *ppvObject = (void *) This->pstrCache; > IStream_AddRef((IStream *) This->pstrCache); > >+ /* We are about to start calling back into the application. It is >+ * possible that the application will release its reference to us in >+ * these callbacks, so we need to add a reference to This to make sure the >+ * URLMonikerImpl is not freed before we reach the end of this method. >+ */ > > The right solution is separating IBinding and IMoniker interfaces. They shouldn't be implemented in the same object. I'll send the patch. Jacek

2 1

Re: urlmon/umon.c: Fix corruption
by Jacek Caban 22 May '05

22 May '05

Uwe Bonnes wrote: >Changelog: > dlls/urlmon/umon.c: URLMonikerImpl_Release() > Release structure elements before Freeing structure > > My patch I sent today fixes this too. > Changelog: > wine/dlls/urlmon/umon.c:URLMonikerImpl_BindToStorage() > Don't use a HeapAllocated pointer for other purposes ... > + if (path) > + HeapFree(GetProcessHeap(), 0, path); You don't need this check. > Changelog: > dlls/wininet/internet.c: CrackURL, dlls/wininet/tests/http.c > Add some escape/unescape cases and code thor that cases ... > + ok(InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents),"InternetCrackUrl failed with GLE 0x%lx\n",GetLastError()); > + fprintf(stderr,"BON:%*s\n", (int)urlComponents.dwUrlPathLength, urlComponents.lpszUrlPath); > > } You shouldn't use fprintf() here. Use trace() instead. Jacek

1 0

Re: [OLE #90] Marshal Objects & Monikers into the ROT
by Alexandre Julliard 22 May '05

22 May '05

Robert Shearman <rob(a)codeweavers.com> writes: > Changelog: > - Marshal objects & monikers into the ROT. > - Test for this behaviour. This fails make test here: ../../../tools/runtest -q -P wine -M ole32.dll -T ../../.. -p ole32_test.exe.so moniker.c && touch moniker.ok fixme:ole:MkParseDisplayName (0x77c518a0, L"clsid:20D04FE0-3AEA-1069-A2D8-08002B30309D:", 0x77acfe68, (nil)): stub. err:ole:CoUnmarshalInterface IMarshal::UnmarshalInterface failed, 0x80004005 moniker.c:145: Test failed: Number of monikers should be equal to 2 not 0 err:ole:CoUnmarshalInterface IMarshal::UnmarshalInterface failed, 0x80004005 moniker.c:164: Test failed: Number of monikers should be equal to 2 not 0 fixme:ole:CreateClassMoniker {0002e005-0000-0000-c000-000000000046} err:ole:get_unmarshaler_from_stream Failed to read common OBJREF header, 0x00000001 make[3]: *** [moniker.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

2 1

WineHQ css; binfmt && Mono && wine
by Brian Vincent 22 May '05

22 May '05

Something broke on WineHQ. For some reason <br /> tags aren't getting parsed right - see this week's WWN for an example. It's displaying "<BR>". I haven't looked into it at all, but I figured someone (Dimi?) might remember messing with this stuff recently. Also, anyone happen to know if Wine can be used in conjunction with binfmt alongside Mono? Are there any unique C# identifiers in the first 128 bits of a .Net executable that could identify it? It appears the Mono guys recommend looking for the magic MZ bytes, which is exactly what Wine requires also. We can't look for "PE" since binfmt can only look at the first 127 bytes of a file. -Brian

8 10

console behaviour of tty vs. x11 driver
by Kuba Ober 22 May '05

22 May '05

Hi, I'm running vc.net as a cross-compiler under wine. Everything looks very nice when you run it with X server running. Yet, when there's no X present, winetty driver kicks in and corrupts the console output. Is there a simple remedy? Here are the problems that I observe: 1. Pointless Xlib error message about it not being able to connect to the X server -- this wastes 2 lines of screen real estate and the apps in question are console-only *anyway* It'd be nice to have an environment variable or a registry setting to disable showing of this message. 2. Winetty seems to use ncurses for simple line-oriented output where winex11 did the right thing and didn't wrap the output with escape sequences in such a weird way 3. Winetty clears the screen upon startup (due to ncurses maybe), so e.g. running things from nmake.exe makes the screen get wiped everytime a compile/link step is invoked. This has a nasty side effect: with winetty driver a simple wine foo.exe > log gives you corrupt output with escape sequences that weren't reallyoutput by foo.exe , whereas with winex11 wine foo.exe > log gives you the *correct* output capture. I will file a bug for it if it's not just something weird on my side. Kuba

2 1

WineConf todo list
by Francois Gouget 21 May '05

21 May '05

I'm trying to gather a list of stuff we said needed to be done at WineConf. Of course the initial list is going to be horribly incomplete but I'm sure others will contribute the missing pieces. * Wine Wiki This seems to be done already. It's available there: http://wiki.winehq.org/ * Add a list of companies providing Wine services and support This discussion/flameware is in full swing. * Putting the videos online Done. Maybe some retouching / cleanup to do if we find someone knowledgeable and willing. * Moving the Wine doc to SourceForge The documentation, i.e. the SGML files in documentation/, uses completely different tools from the rest of Wine. Also Alexandre does not want to deal with its translations. So move the SGML documentation to its own CVS repository, winedoc, which we could host on SourceForge. The English version would go in the en subdirectory so we can easily add translations. * Check in the French translation and corresponding infrastructure. The translation will go in the fr subdirectory of the winedoc CVS repository. At the same time the infrastructure for adding other translations should be put in place. * Make an easy to use cxtest script. The idea is to have a script which could be put in a crontab so it can be run entirely automatically and which would: - checkout / update and recompile CXTest - checkout / update and recompile the latest Wine - run regression tests using Wine's Winelib applications - maybe download some free applications and run tests to make sure they install and start up Jozef Stefanka is planning to work on this. * Get rid of the configuration file Well that's the 0.9 todo list. Maybe it's best to keep it separate from this list. * Find a way to document the registry I had a discussion with Alexandre and lamented that, now that we're going to move things out of the configuration, we won't be able to put comments describing what each setting does. However we already have the problem with all of the Windows settings. Furthermore he noted that it's hard to find where a given setting is used in the Wine code (because the registry path is encoded as a Unicode string?). And the problem is compounded by the lack of proper documentation for registry settings in MSDN. So the idea is to create a way to document each registry setting in the source code so it can be extracted with a tool similar to c2man.pl (or with a hacked c2man.pl). -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Avoid the Gates of Hell - use Linux.

4 3

Re: dwarf2 support progress step 4
by Mike Hearn 21 May '05

21 May '05

On Fri, 20 May 2005 23:16:12 +0200, Raphael wrote: > We only have to build a correct symt model to get it working perfectly What exactly will this work allow - will winedbg get better as a result? At the moment backtraces already give function information... thanks -mike

4 3

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