April 2011 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Merge the IWineD3DSwapChain::SetDestWindowOverride () implementations.
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 926dfc5c49dde8401732a943c1055ba6631bcc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=926dfc5c49dde8401732a943c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 12 18:28:41 2011 +0200 wined3d: Merge the IWineD3DSwapChain::SetDestWindowOverride() implementations. --- dlls/wined3d/swapchain.c | 46 +++++++++++++++++++--------------------------- 1 files changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a44407f..3238a61 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -135,6 +135,22 @@ static void * WINAPI IWineD3DBaseSwapChainImpl_GetParent(IWineD3DSwapChain *ifac return ((IWineD3DSwapChainImpl *)iface)->parent; } +static HRESULT WINAPI IWineD3DBaseSwapChainImpl_SetDestWindowOverride(IWineD3DSwapChain *iface, HWND window) +{ + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; + + if (!window) + window = swapchain->device_window; + if (window == swapchain->win_handle) + return WINED3D_OK; + + TRACE("Setting swapchain %p window from %p to %p.\n", + swapchain, swapchain->win_handle, window); + swapchain->win_handle = window; + + return WINED3D_OK; +} + static HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetFrontBufferData(IWineD3DSwapChain *iface, IWineD3DSurface *dst_surface) { @@ -410,7 +426,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, RECT src_rect, dst_rect; BOOL render_to_fbo; - IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); + IWineD3DBaseSwapChainImpl_SetDestWindowOverride(iface, hDestWindowOverride); context = context_acquire(This->device, This->back_buffers[0]); if (!context->valid) @@ -637,19 +653,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, return WINED3D_OK; } -static HRESULT WINAPI IWineD3DSwapChainImpl_SetDestWindowOverride(IWineD3DSwapChain *iface, HWND window) -{ - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; - - if (!window) window = swapchain->device_window; - if (window == swapchain->win_handle) return WINED3D_OK; - - TRACE("Setting swapchain %p window from %p to %p\n", swapchain, swapchain->win_handle, window); - swapchain->win_handle = window; - - return WINED3D_OK; -} - static const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = { /* IUnknown */ @@ -660,7 +663,7 @@ static const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = IWineD3DBaseSwapChainImpl_GetParent, IWineD3DBaseSwapChainImpl_GetDevice, IWineD3DSwapChainImpl_Present, - IWineD3DSwapChainImpl_SetDestWindowOverride, + IWineD3DBaseSwapChainImpl_SetDestWindowOverride, IWineD3DBaseSwapChainImpl_GetFrontBufferData, IWineD3DBaseSwapChainImpl_GetBackBuffer, IWineD3DBaseSwapChainImpl_GetRasterStatus, @@ -747,17 +750,6 @@ void x11_copy_to_screen(IWineD3DSwapChainImpl *swapchain, const RECT *rect) ReleaseDC(window, dst_dc); } -static HRESULT WINAPI IWineGDISwapChainImpl_SetDestWindowOverride(IWineD3DSwapChain *iface, HWND window) -{ - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; - - TRACE("iface %p, window %p.\n", iface, window); - - swapchain->win_handle = window; - - return WINED3D_OK; -} - static HRESULT WINAPI IWineGDISwapChainImpl_Present(IWineD3DSwapChain *iface, const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, const RGNDATA *pDirtyRegion, DWORD flags) @@ -848,7 +840,7 @@ static const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl = IWineD3DBaseSwapChainImpl_GetParent, IWineD3DBaseSwapChainImpl_GetDevice, IWineGDISwapChainImpl_Present, - IWineGDISwapChainImpl_SetDestWindowOverride, + IWineD3DBaseSwapChainImpl_SetDestWindowOverride, IWineD3DBaseSwapChainImpl_GetFrontBufferData, IWineD3DBaseSwapChainImpl_GetBackBuffer, IWineD3DBaseSwapChainImpl_GetRasterStatus,

1 0

Henri Verbeet : wined3d: Take hDestWindowOverride into account in IWineGDISwapChainImpl_Present().
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 7ace689742809dc33b54506182cd87de131bd02d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ace689742809dc33b5450618… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 12 18:28:42 2011 +0200 wined3d: Take hDestWindowOverride into account in IWineGDISwapChainImpl_Present(). --- dlls/wined3d/swapchain.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3238a61..990758d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -757,6 +757,8 @@ static HRESULT WINAPI IWineGDISwapChainImpl_Present(IWineD3DSwapChain *iface, IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; IWineD3DSurfaceImpl *front, *back; + IWineD3DBaseSwapChainImpl_SetDestWindowOverride(iface, hDestWindowOverride); + if (!swapchain->back_buffers) { WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL\n");

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 35e42ea40e0ccaec1b2f6215a57094dfd9de5a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e42ea40e0ccaec1b2f6215a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Apr 12 19:29:30 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/lt.po b/po/lt.po index 6b72045..94ac0de 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-11 21:43+0300\n" +"PO-Revision-Date: 2011-04-12 19:25+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -7723,9 +7723,8 @@ msgid "Inf&o" msgstr "&Informacija" #: clock.rc:42 -#, fuzzy msgid "&About Clock" -msgstr "&Apie laikrodį..." +msgstr "&Apie laikrodį" #: clock.rc:48 msgid "Clock" @@ -9056,9 +9055,8 @@ msgid "&Arrange Icons" msgstr "&Išdėstyti piktogramas" #: progman.rc:54 -#, fuzzy msgid "&About Program Manager" -msgstr "Programų tvarkytuvė" +msgstr "&Apie Programų tvarkytuvę" #: progman.rc:60 msgid "Program Manager" @@ -10824,9 +10822,8 @@ msgid "Arrange &Symbols" msgstr "Išdėstyti si&mbolius" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File" -msgstr "&Apie Winefile..." +msgstr "&Apie Wine failų tvarkytuvę" #: winefile.rc:93 msgid "Applying font settings" @@ -10921,9 +10918,8 @@ msgid "&Fastest Times..." msgstr "&Geriausi laikai" #: winemine.rc:48 -#, fuzzy msgid "&About WineMine" -msgstr "Apie &Wine" +msgstr "&Apie Wine minas" #: winemine.rc:27 msgid "WineMine"

1 0

Austin English : ole2disp.dll16: Add a stub for SETERRORINFO.
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 554715ce7293b0f4dfffae3758df411f520a7a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=554715ce7293b0f4dfffae375… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 12 12:09:17 2011 -0500 ole2disp.dll16: Add a stub for SETERRORINFO. --- dlls/ole2disp.dll16/ole2disp.c | 9 +++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 081683e..139b492 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -248,3 +248,12 @@ HRESULT WINAPI RegisterActiveObject16( FIXME("(%p,%s,0x%08x,%p):stub\n",punk,debugstr_guid(rclsid),dwFlags,pdwRegister); return E_NOTIMPL; } + +/****************************************************************************** + * SetErrorInfo [OLE2DISP.110] + */ +HRESULT WINAPI SetErrorInfo16(ULONG dwReserved, IErrorInfo *perrinfo) +{ + FIXME("stub: (%d, %p)\n", dwReserved, perrinfo); + return E_INVALIDARG; +} diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 2f9e2ef..0bc4bae 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -107,7 +107,7 @@ 107 stub DOINVOKEMETHOD 108 stub VARIANTCHANGETYPEEX 109 stub SAFEARRAYPTROFINDEX -110 stub SETERRORINFO +110 pascal SetErrorInfo(long ptr) SetErrorInfo16 111 stub GETERRORINFO 112 stub CREATEERRORINFO 113 stub _IID_IERRORINFO

1 0

André Hentschel : mshtml: Fix Warning message.
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 9007123b23bd372d48309e2872f15a11214a63cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9007123b23bd372d48309e287… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 12 19:25:57 2011 +0200 mshtml: Fix Warning message. --- dlls/mshtml/nsembed.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fb283e0..d6d666f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -321,7 +321,7 @@ static BOOL load_xul(const PRUnichar *gre_path) xul_handle = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if(!xul_handle) { - WARN("Could not load XPCOM: %d\n", GetLastError()); + WARN("Could not load XUL: %d\n", GetLastError()); return FALSE; }

1 0

André Hentschel : gdiplus: Add a FIXME.
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 66f212e66715fb628c4366a7634e97a92ff40778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f212e66715fb628c4366a76… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 12 20:17:02 2011 +0200 gdiplus: Add a FIXME. --- dlls/gdiplus/brush.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d6fb62d..d1af903 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1253,11 +1253,16 @@ GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorCount(GpPathGradient *brush, INT *count) { + static int calls; + TRACE("(%p, %p)\n", brush, count); if (!brush || !count) return InvalidParameter; + if(!(calls++)) + FIXME("not implemented\n"); + return NotImplemented; }

1 0

Rico Schüller : d3dcompiler: Fix HeapAlloc/ HeapFree for type members in the reflection parser.
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: c49f09d6f8f84cccd02a131e2ca7b10d81334aff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c49f09d6f8f84cccd02a131e2… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Apr 12 21:24:55 2011 +0200 d3dcompiler: Fix HeapAlloc/HeapFree for type members in the reflection parser. --- dlls/d3dcompiler_43/reflection.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index ea01e24..5dd7c38 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -235,6 +235,7 @@ static void d3dcompiler_shader_reflection_type_destroy(struct wine_rb_entry *ent { free_type_member(&t->members[i]); } + HeapFree(GetProcessHeap(), 0, t->members); } HeapFree(GetProcessHeap(), 0, t); @@ -1235,7 +1236,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type { const char *ptr2 = data + member_offset; - members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*members)); + members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*members) * desc->Members); if (!members) { ERR("Failed to allocate type memory.\n");

1 0

Rico Schüller : d3dx9: Make some functions inline.
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 4dcb3ea325c39d48b90e21f9b63247e2bb99f42c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcb3ea325c39d48b90e21f9b… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Apr 12 21:25:03 2011 +0200 d3dx9: Make some functions inline. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f31ac31..ba02c56 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -102,12 +102,12 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) } } -static struct d3dx_parameter *get_parameter_struct(D3DXHANDLE handle) +static inline struct d3dx_parameter *get_parameter_struct(D3DXHANDLE handle) { return (struct d3dx_parameter *) handle; } -static D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) +static inline D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) { return (D3DXHANDLE) parameter; }

1 0

Rico Schüller : d3dx9: Parse effect pass and technique .
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 8ec21524ec0b2cb7f194838c37306bd0bce556c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec21524ec0b2cb7f194838c3… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Apr 12 21:25:06 2011 +0200 d3dx9: Parse effect pass and technique. --- dlls/d3dx9_36/effect.c | 366 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 365 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ec21524ec0b2cb7f1948…

1 0

Alexandre Julliard : winex11: Add infrastructure for managing the extra data of generic extension events .
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: a8575a8b4dc6f3678654dd3b72ece6d6f58632fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8575a8b4dc6f3678654dd3b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 12 21:16:15 2011 +0200 winex11: Add infrastructure for managing the extra data of generic extension events. --- configure | 12 ++++++++++++ configure.ac | 2 +- dlls/winex11.drv/event.c | 32 ++++++++++++++++++++++++++------ dlls/winex11.drv/x11drv.h | 3 +++ dlls/winex11.drv/x11drv_main.c | 13 +++++++++++++ dlls/winex11.drv/xrandr.c | 4 +--- dlls/winex11.drv/xrender.c | 2 -- include/config.h.in | 3 +++ 8 files changed, 59 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 76ecd55..8e8d044 100755 --- a/configure +++ b/configure @@ -8733,6 +8733,18 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "XEvent" "xcookie" "ac_cv_member_XEvent_xcookie" "#ifdef HAVE_X11_XLIB_H +#include <X11/Xlib.h> +#endif +" +if test "x$ac_cv_member_XEvent_xcookie" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_XEVENT_XCOOKIE 1 +_ACEOF + + +fi diff --git a/configure.ac b/configure.ac index 21c8d85..e82d193 100644 --- a/configure.ac +++ b/configure.ac @@ -1045,7 +1045,7 @@ then [libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.]) dnl *** Check for XICCallback struct - AC_CHECK_MEMBERS([XICCallback.callback],,, + AC_CHECK_MEMBERS([XICCallback.callback, XEvent.xcookie],,, [#ifdef HAVE_X11_XLIB_H #include <X11/Xlib.h> #endif]) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 474e288..a05e906 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -86,6 +86,9 @@ extern BOOL ximInComposeMode; #define XEMBED_UNREGISTER_ACCELERATOR 13 #define XEMBED_ACTIVATE_ACCELERATOR 14 +Bool (*pXGetEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ) = NULL; +void (*pXFreeEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ) = NULL; + /* Event handlers */ static void X11DRV_FocusIn( HWND hwnd, XEvent *event ); static void X11DRV_FocusOut( HWND hwnd, XEvent *event ); @@ -140,8 +143,6 @@ static x11drv_event_handler handlers[MAX_EVENT_HANDLERS] = NULL /* 35 GenericEvent */ }; - - static const char * event_names[MAX_EVENT_HANDLERS] = { NULL, NULL, "KeyPress", "KeyRelease", "ButtonPress", "ButtonRelease", @@ -152,13 +153,29 @@ static const char * event_names[MAX_EVENT_HANDLERS] = "CirculateNotify", "CirculateRequest", "PropertyNotify", "SelectionClear", "SelectionRequest", "SelectionNotify", "ColormapNotify", "ClientMessage", "MappingNotify", "GenericEvent" }; + /* return the name of an X event */ static const char *dbgstr_event( int type ) { - if (type < MAX_EVENT_HANDLERS && event_names[type]) return event_names[type - KeyPress]; + if (type < MAX_EVENT_HANDLERS && event_names[type]) return event_names[type]; return wine_dbg_sprintf( "Unknown event %d", type ); } +static inline void get_event_data( XEvent *event ) +{ +#if defined(GenericEvent) && defined(HAVE_XEVENT_XCOOKIE) + if (event->xany.type != GenericEvent) return; + if (!pXGetEventData || !pXGetEventData( event->xany.display, event )) event->xcookie.data = NULL; +#endif +} + +static inline void free_event_data( XEvent *event ) +{ +#if defined(GenericEvent) && defined(HAVE_XEVENT_XCOOKIE) + if (event->xany.type != GenericEvent) return; + if (event->xcookie.data) pXFreeEventData( event->xany.display, event ); +#endif +} /*********************************************************************** * X11DRV_register_event_handler @@ -333,22 +350,25 @@ static int process_events( Display *display, Bool (*filter)(Display*, XEvent*,XP else continue; /* filtered, ignore it */ } + get_event_data( &event ); if (prev_event.type) action = merge_events( &prev_event, &event ); switch( action ) { - case MERGE_DISCARD: /* discard prev, keep new */ - prev_event = event; - break; case MERGE_HANDLE: /* handle prev, keep new */ call_event_handler( display, &prev_event ); + /* fall through */ + case MERGE_DISCARD: /* discard prev, keep new */ + free_event_data( &prev_event ); prev_event = event; break; case MERGE_KEEP: /* handle new, keep prev for future merging */ call_event_handler( display, &event ); + free_event_data( &event ); break; } } if (prev_event.type) call_event_handler( display, &prev_event ); + free_event_data( &prev_event ); XFlush( gdi_display ); wine_tsx11_unlock(); if (count) TRACE( "processed %d events\n", count ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a06de4f..5f6c5cf 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -729,6 +729,9 @@ extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event ); extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event ); extern void X11DRV_MappingNotify( HWND hWnd, XEvent *event ); +extern Bool (*pXGetEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ); +extern void (*pXFreeEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ); + extern DWORD EVENT_x11_time_to_win32_time(Time time); /* X11 driver private messages, must be in the range 0x80001000..0x80001fff */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 473b61f..9ac20c3 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -529,7 +529,20 @@ sym_not_found: */ static BOOL process_attach(void) { + char error[1024]; Display *display; + void *libx11 = wine_dlopen( SONAME_LIBX11, RTLD_NOW|RTLD_GLOBAL, error, sizeof(error) ); + + if (!libx11) + { + ERR( "failed to load %s: %s\n", SONAME_LIBX11, error ); + return FALSE; + } + pXGetEventData = wine_dlsym( libx11, "XGetEventData", NULL, 0 ); + pXFreeEventData = wine_dlsym( libx11, "XFreeEventData", NULL, 0 ); +#ifdef SONAME_LIBXEXT + wine_dlopen( SONAME_LIBXEXT, RTLD_NOW|RTLD_GLOBAL, NULL, 0 ); +#endif setup_options(); diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index c313bab..0aea463 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -71,9 +71,7 @@ static int load_xrandr(void) { int r = 0; - if (wine_dlopen(SONAME_LIBX11, RTLD_NOW|RTLD_GLOBAL, NULL, 0) && - wine_dlopen(SONAME_LIBXEXT, RTLD_NOW|RTLD_GLOBAL, NULL, 0) && - wine_dlopen(SONAME_LIBXRENDER, RTLD_NOW|RTLD_GLOBAL, NULL, 0) && + if (wine_dlopen(SONAME_LIBXRENDER, RTLD_NOW|RTLD_GLOBAL, NULL, 0) && (xrandr_handle = wine_dlopen(SONAME_LIBXRANDR, RTLD_NOW, NULL, 0))) { diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 33e420a..52e7f25 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -346,8 +346,6 @@ void X11DRV_XRender_Init(void) int event_base, i; if (client_side_with_render && - wine_dlopen(SONAME_LIBX11, RTLD_NOW|RTLD_GLOBAL, NULL, 0) && - wine_dlopen(SONAME_LIBXEXT, RTLD_NOW|RTLD_GLOBAL, NULL, 0) && (xrender_handle = wine_dlopen(SONAME_LIBXRENDER, RTLD_NOW, NULL, 0))) { diff --git a/include/config.h.in b/include/config.h.in index b7460cc..19a6b48 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1118,6 +1118,9 @@ /* Define to 1 if you have the <X11/Xutil.h> header file. */ #undef HAVE_X11_XUTIL_H +/* Define to 1 if `xcookie' is a member of `XEvent'. */ +#undef HAVE_XEVENT_XCOOKIE + /* Define to 1 if `callback' is a member of `XICCallback'. */ #undef HAVE_XICCALLBACK_CALLBACK

1 0