May 2016 - Wine-Commits - list.winehq.org

Piotr Caban : kernel32: Use utf8 for filenames encoding if different encoding was not specified on Mac.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: 4fdfa29e604070f9fd504cc62bcc877cea42fe09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fdfa29e604070f9fd504cc62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 31 11:56:42 2016 +0200 kernel32: Use utf8 for filenames encoding if different encoding was not specified on Mac. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b5a8680..f4ff6d3 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3646,7 +3646,6 @@ void LOCALE_Init(void) CFStringGetCString( user_locale_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); strcat(user_locale, ".UTF-8"); - unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ setenv( "LANG", user_locale, 0 ); TRACE( "setting locale to '%s'\n", user_locale ); #endif /* __APPLE__ */ @@ -3657,6 +3656,9 @@ void LOCALE_Init(void) if (!lcid_LC_MESSAGES) lcid_LC_MESSAGES = lcid_LC_CTYPE; #ifdef __APPLE__ + if (!unix_cp) + unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ + /* Override lcid_LC_MESSAGES with user's preferred language if LC_MESSAGES is set to default */ if (!getenv("LC_ALL") && !getenv("LC_MESSAGES")) {

1 0

Alexandre Julliard : winex11: Hide window icons in desktop mode when the taskbar is active.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: 6f2c18609b27a4fe80f3e538e2454579d8d6b3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2c18609b27a4fe80f3e538e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 31 22:41:37 2016 +0900 winex11: Hide window icons in desktop mode when the taskbar is active. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 59affca..06ce26e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2404,6 +2404,16 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags release_win_data( data ); } +/* check if the window icon should be hidden (i.e. moved off-screen) */ +static BOOL hide_icon( struct x11drv_win_data *data ) +{ + static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; + + if (data->managed) return TRUE; + /* hide icons in desktop mode when the taskbar is active */ + if (root_window == DefaultRootWindow( gdi_display )) return FALSE; + return IsWindowVisible( FindWindowW( trayW, NULL )); +} /*********************************************************************** * ShowWindow (X11DRV.@) @@ -2418,18 +2428,18 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data = get_win_data( hwnd ); - if (!data || !data->whole_window || !data->managed) goto done; + if (!data || !data->whole_window) goto done; if (IsRectEmpty( rect )) goto done; if (style & WS_MINIMIZE) { - if (rect->left != -32000 || rect->top != -32000) + if (((rect->left != -32000 || rect->top != -32000)) && hide_icon( data )) { OffsetRect( rect, -32000 - rect->left, -32000 - rect->top ); swp &= ~(SWP_NOMOVE | SWP_NOCLIENTMOVE); } goto done; } - if (!data->mapped || data->iconic) goto done; + if (!data->managed || !data->mapped || data->iconic) goto done; /* only fetch the new rectangle if the ShowWindow was a result of a window manager event */

1 0

Alexandre Julliard : explorer: Add a generic handler for desktop notifications.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: f4568fc6402c84e2053eb288f84d33f79025118e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4568fc6402c84e2053eb288f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 31 13:54:07 2016 +0900 explorer: Add a generic handler for desktop notifications. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 2 +- programs/explorer/explorer_private.h | 2 +- programs/explorer/systray.c | 13 ++++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 2b8502b..d306bb9 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -636,7 +636,7 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR return 0; case WM_PARENTNOTIFY: - if (LOWORD(wp) == WM_DESTROY) cleanup_systray_window( (HWND)lp ); + handle_parent_notify( (HWND)lp, wp ); return 0; case WM_LBUTTONDBLCLK: diff --git a/programs/explorer/explorer_private.h b/programs/explorer/explorer_private.h index dbe50be..995e7eb 100644 --- a/programs/explorer/explorer_private.h +++ b/programs/explorer/explorer_private.h @@ -24,7 +24,7 @@ extern void manage_desktop( WCHAR *arg ) DECLSPEC_HIDDEN; extern void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL enable_shell ) DECLSPEC_HIDDEN; extern void initialize_appbar(void) DECLSPEC_HIDDEN; -extern void cleanup_systray_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern void handle_parent_notify( HWND hwnd, WPARAM wp ) DECLSPEC_HIDDEN; extern void do_startmenu( HWND owner ) DECLSPEC_HIDDEN; extern LRESULT menu_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) DECLSPEC_HIDDEN; diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index eca49f7..8406ad2 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -447,7 +447,7 @@ static BOOL delete_icon(struct icon *icon) } /* cleanup icons belonging to a window that has been destroyed */ -void cleanup_systray_window( HWND hwnd ) +static void cleanup_systray_window( HWND hwnd ) { struct icon *icon, *next; @@ -680,6 +680,17 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l return 0; } +/* notifcation posted to the desktop window */ +void handle_parent_notify( HWND hwnd, WPARAM wp ) +{ + switch (LOWORD(wp)) + { + case WM_DESTROY: + cleanup_systray_window( hwnd ); + break; + } +} + /* this function creates the listener window */ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enable_shell ) {

1 0

Francois Gouget : msxml3: Spelling fixes.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: c7292a5816acc034cca84b41ce45fe2cb3ecf62d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7292a5816acc034cca84b41c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:41:57 2016 +0200 msxml3: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0ce135b..78cfe08 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2522,7 +2522,7 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz if (encoding == XML_CHAR_ENCODING_NONE) { const WCHAR *ptr = (WCHAR*)buffer; - /* xml declaration with possibly specified encoding will be still handled by parser */ + /* an xml declaration with optional encoding will still be handled by the parser */ if ((size >= 2) && *ptr == '<' && ptr[1] != '?') { enc_name = (xmlChar*)xmlGetCharEncodingName(XML_CHAR_ENCODING_UTF16LE);

1 0

Hadrien Boizard : msvcrt: Use BOOL type where appropriate.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: 39037a14e841e31b4fc426d6381180f074336902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39037a14e841e31b4fc426d63… Author: Hadrien Boizard <h.boizard(a)laposte.net> Date: Wed May 25 21:50:55 2016 +0200 msvcrt: Use BOOL type where appropriate. Signed-off-by: Hadrien Boizard <h.boizard(a)laposte.net> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 3e71c91..d307399 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -664,7 +664,7 @@ int CDECL _mbsnbcpy_s_l(unsigned char* dst, MSVCRT_size_t size, if((locale ? locale->mbcinfo : get_mbcinfo())->ismbcodepage) { - int is_lead = 0; + BOOL is_lead = FALSE; while (*src && n) { if(pos == size) @@ -745,7 +745,7 @@ unsigned char* CDECL _mbsnbcpy(unsigned char* dst, const unsigned char* src, MSV return dst; if(get_mbcinfo()->ismbcodepage) { - int is_lead = 0; + BOOL is_lead = FALSE; while (*src && n) { is_lead = (!is_lead && _ismbblead(*src));

1 0

Andrey Gusev : include: Fix a typo in IHTMLSelection interface.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: 9cb3bf1e6d7620f0576d141f97051ff698f0353e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb3bf1e6d7620f0576d141f9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 26 23:28:24 2016 +0300 include: Fix a typo in IHTMLSelection interface. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 1ea4b5b..8284b25 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9772,7 +9772,7 @@ interface IHTMLSelection : IDispatch [id(DISPID_IHTMLSELECTION_COLLAPSE)] HRESULT collapse( [in] IDispatch *parentNode, - [in] long offfset); + [in] long offset); [id(DISPID_IHTMLSELECTION_COLLAPSETOSTART)] HRESULT collapseToStart();

1 0

Francois Gouget : usp10: Punctuation fixes.
by Alexandre Julliard May 31, 2016

May 31, 2016

Module: wine Branch: master Commit: 65893a7142b536643db817ed3d24304b8a39415a URL: http://source.winehq.org/git/wine.git/?a=commit;h=65893a7142b536643db817ed3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:41:22 2016 +0200 usp10: Punctuation fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 622a061..db12934 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2762,9 +2762,9 @@ static inline int get_cluster_advance(const int* piAdvance, * ScriptXtoCP (USP10.@) * * Basic algorithm : - * use piAdvance to find the cluster we are looking at - * Find the character that is the first character of the cluster - * That is our base piCP + * Use piAdvance to find the cluster we are looking at. + * Find the character that is the first character of the cluster. + * That is our base piCP. * If the script snaps to cluster boundaries (Hebrew, Indic, Thai) then we * are good. Otherwise if the cluster is larger than 1 glyph we need to * determine how far through the cluster to advance the cursor.

1 0

Miklós Máté : winex11: Use GLX 1.3 for windows.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: c89dc58deb9ba74d8dcd7faf7012203cff0724a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89dc58deb9ba74d8dcd7faf7… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Thu May 26 23:43:14 2016 +0200 winex11: Use GLX 1.3 for windows. Differentiate between X window and GLX window, use GLX 1.3 for GL window create/destroy. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 49 ++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 66e92f7..d89a193 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -217,7 +217,7 @@ struct wgl_context int numAttribs; /* This is needed for delaying wglCreateContextAttribsARB */ int attribList[16]; /* This is needed for delaying wglCreateContextAttribsARB */ GLXContext ctx; - Drawable drawables[2]; + GLXDrawable drawables[2]; BOOL refresh_drawables; struct list entry; }; @@ -254,7 +254,8 @@ enum dc_gl_type struct gl_drawable { enum dc_gl_type type; /* type of GL surface */ - Drawable drawable; /* drawable for rendering to the client area */ + GLXDrawable drawable; /* drawable for rendering with GL */ + Window window; /* window if drawable is a GLXWindow */ Pixmap pixmap; /* base pixmap if drawable is a GLXPixmap */ Colormap colormap; /* colormap used for the drawable */ const struct wgl_pixel_format *format; /* pixel format for the drawable */ @@ -397,6 +398,8 @@ static GLXContext (*pglXCreateNewContext)( Display *dpy, GLXFBConfig config, int static Bool (*pglXMakeContextCurrent)( Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx ); static GLXPixmap (*pglXCreatePixmap)( Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list ); static void (*pglXDestroyPixmap)( Display *dpy, GLXPixmap pixmap ); +static GLXWindow (*pglXCreateWindow)( Display *dpy, GLXFBConfig config, Window win, const int *attrib_list ); +static void (*pglXDestroyWindow)( Display *dpy, GLXWindow win ); /* GLX Extensions */ static GLXContext (*pglXCreateContextAttribsARB)(Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list); @@ -647,6 +650,8 @@ static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context ) LOAD_FUNCPTR(glXGetFBConfigs); LOAD_FUNCPTR(glXCreatePixmap); LOAD_FUNCPTR(glXDestroyPixmap); + LOAD_FUNCPTR(glXCreateWindow); + LOAD_FUNCPTR(glXDestroyWindow); #undef LOAD_FUNCPTR /* It doesn't matter if these fail. They'll only be used if the driver reports @@ -1199,7 +1204,7 @@ static const struct wgl_pixel_format *get_pixel_format(Display *display, int iPi } /* Mark any allocated context using the glx drawable 'old' to use 'new' */ -static void mark_drawable_dirty(Drawable old, Drawable new) +static void mark_drawable_dirty(GLXDrawable old, GLXDrawable new) { struct wgl_context *ctx; @@ -1229,7 +1234,7 @@ static inline void sync_context(struct wgl_context *context) } } -static BOOL set_swap_interval(Drawable drawable, int interval) +static BOOL set_swap_interval(GLXDrawable drawable, int interval) { BOOL ret = TRUE; @@ -1310,7 +1315,8 @@ static void free_gl_drawable( struct gl_drawable *gl ) switch (gl->type) { case DC_GL_CHILD_WIN: - XDestroyWindow( gdi_display, gl->drawable ); + pglXDestroyWindow( gdi_display, gl->drawable ); + XDestroyWindow( gdi_display, gl->window ); XFreeColormap( gdi_display, gl->colormap ); break; case DC_GL_PIXMAP_WIN: @@ -1339,7 +1345,9 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) if (data) { gl->type = DC_GL_WINDOW; - gl->drawable = create_client_window( data, gl->visual ); + gl->window = create_client_window( data, gl->visual ); + if (gl->window) + gl->drawable = pglXCreateWindow( gdi_display, gl->format->fbconfig, gl->window, NULL ); release_win_data( data ); } } @@ -1365,14 +1373,18 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) XInstallColormap(gdi_display, attrib.colormap); gl->type = DC_GL_CHILD_WIN; - gl->drawable = XCreateWindow( gdi_display, dummy_parent, 0, 0, + gl->window = XCreateWindow( gdi_display, dummy_parent, 0, 0, gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, 0, gl->visual->depth, InputOutput, gl->visual->visual, CWColormap | CWOverrideRedirect, &attrib ); - if (gl->drawable) + if (gl->window) { - pXCompositeRedirectWindow(gdi_display, gl->drawable, CompositeRedirectManual); - XMapWindow(gdi_display, gl->drawable); + gl->drawable = pglXCreateWindow( gdi_display, gl->format->fbconfig, gl->window, NULL ); + if (gl->drawable) + { + pXCompositeRedirectWindow(gdi_display, gl->window, CompositeRedirectManual); + XMapWindow(gdi_display, gl->window); + } } else XFreeColormap( gdi_display, gl->colormap ); } @@ -1498,7 +1510,7 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) { struct gl_drawable *gl; - Drawable glxp; + GLXDrawable glxp; Pixmap pix; int mask = 0; XWindowChanges changes; @@ -1516,7 +1528,7 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r switch (gl->type) { case DC_GL_CHILD_WIN: - if (mask) XConfigureWindow( gdi_display, gl->drawable, mask, &changes ); + if (mask) XConfigureWindow( gdi_display, gl->window, mask, &changes ); break; case DC_GL_PIXMAP_WIN: if (!mask) break; @@ -1553,7 +1565,7 @@ done: void set_gl_drawable_parent( HWND hwnd, HWND parent ) { struct gl_drawable *gl; - Drawable old_drawable; + GLXDrawable old_drawable; if (!(gl = get_gl_drawable( hwnd, 0 ))) return; @@ -1566,7 +1578,8 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) break; case DC_GL_CHILD_WIN: if (parent != GetDesktopWindow()) goto done; - XDestroyWindow( gdi_display, gl->drawable ); + pglXDestroyWindow( gdi_display, gl->drawable ); + XDestroyWindow( gdi_display, gl->window ); XFreeColormap( gdi_display, gl->colormap ); break; case DC_GL_PIXMAP_WIN: @@ -1999,7 +2012,7 @@ static void wglFinish(void) switch (gl->type) { case DC_GL_PIXMAP_WIN: escape.gl_drawable = gl->pixmap; break; - case DC_GL_CHILD_WIN: escape.gl_drawable = gl->drawable; break; + case DC_GL_CHILD_WIN: escape.gl_drawable = gl->window; break; default: break; } sync_context(ctx); @@ -2024,7 +2037,7 @@ static void wglFlush(void) switch (gl->type) { case DC_GL_PIXMAP_WIN: escape.gl_drawable = gl->pixmap; break; - case DC_GL_CHILD_WIN: escape.gl_drawable = gl->drawable; break; + case DC_GL_CHILD_WIN: escape.gl_drawable = gl->window; break; default: break; } sync_context(ctx); @@ -2948,7 +2961,7 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) static BOOL initialized = FALSE; int prev_binded_texture = 0; GLXContext prev_context; - Drawable prev_drawable; + GLXDrawable prev_drawable; prev_context = pglXGetCurrentContext(); prev_drawable = pglXGetCurrentDrawable(); @@ -3322,7 +3335,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) break; case DC_GL_CHILD_WIN: if (ctx) sync_context( ctx ); - escape.gl_drawable = gl->drawable; + escape.gl_drawable = gl->window; /* fall through */ default: pglXSwapBuffers(gdi_display, gl->drawable);

1 0

Miklós Máté : winex11: Use GLX 1.3 for pixmaps.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: 9859365d7736111b13035ca4b799074db5ffeb1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9859365d7736111b13035ca4b… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Thu May 26 23:43:13 2016 +0200 winex11: Use GLX 1.3 for pixmaps. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0f7534e..66e92f7 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -373,8 +373,6 @@ static void (*pglXDestroyContext)( Display *dpy, GLXContext ctx ); static Bool (*pglXMakeCurrent)( Display *dpy, GLXDrawable drawable, GLXContext ctx); static void (*pglXCopyContext)( Display *dpy, GLXContext src, GLXContext dst, unsigned long mask ); static void (*pglXSwapBuffers)( Display *dpy, GLXDrawable drawable ); -static GLXPixmap (*pglXCreateGLXPixmap)( Display *dpy, XVisualInfo *visual, Pixmap pixmap ); -static void (*pglXDestroyGLXPixmap)( Display *dpy, GLXPixmap pixmap ); static Bool (*pglXQueryExtension)( Display *dpy, int *errorb, int *event ); static Bool (*pglXQueryVersion)( Display *dpy, int *maj, int *min ); static Bool (*pglXIsDirect)( Display *dpy, GLXContext ctx ); @@ -397,6 +395,8 @@ static void (*pglXDestroyPbuffer)( Display *dpy, GLXPbuffer pbuf ); static void (*pglXQueryDrawable)( Display *dpy, GLXDrawable draw, int attribute, unsigned int *value ); static GLXContext (*pglXCreateNewContext)( Display *dpy, GLXFBConfig config, int renderType, GLXContext shareList, Bool direct ); static Bool (*pglXMakeContextCurrent)( Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx ); +static GLXPixmap (*pglXCreatePixmap)( Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list ); +static void (*pglXDestroyPixmap)( Display *dpy, GLXPixmap pixmap ); /* GLX Extensions */ static GLXContext (*pglXCreateContextAttribsARB)(Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list); @@ -624,11 +624,9 @@ static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context ) LOAD_FUNCPTR(glXChooseVisual); LOAD_FUNCPTR(glXCopyContext); LOAD_FUNCPTR(glXCreateContext); - LOAD_FUNCPTR(glXCreateGLXPixmap); LOAD_FUNCPTR(glXGetCurrentContext); LOAD_FUNCPTR(glXGetCurrentDrawable); LOAD_FUNCPTR(glXDestroyContext); - LOAD_FUNCPTR(glXDestroyGLXPixmap); LOAD_FUNCPTR(glXGetConfig); LOAD_FUNCPTR(glXIsDirect); LOAD_FUNCPTR(glXMakeCurrent); @@ -647,6 +645,8 @@ static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context ) LOAD_FUNCPTR(glXDestroyPbuffer); LOAD_FUNCPTR(glXMakeContextCurrent); LOAD_FUNCPTR(glXGetFBConfigs); + LOAD_FUNCPTR(glXCreatePixmap); + LOAD_FUNCPTR(glXDestroyPixmap); #undef LOAD_FUNCPTR /* It doesn't matter if these fail. They'll only be used if the driver reports @@ -1314,7 +1314,7 @@ static void free_gl_drawable( struct gl_drawable *gl ) XFreeColormap( gdi_display, gl->colormap ); break; case DC_GL_PIXMAP_WIN: - pglXDestroyGLXPixmap( gdi_display, gl->drawable ); + pglXDestroyPixmap( gdi_display, gl->drawable ); XFreePixmap( gdi_display, gl->pixmap ); break; default: @@ -1387,7 +1387,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) gl->visual->depth ); if (gl->pixmap) { - gl->drawable = pglXCreateGLXPixmap( gdi_display, gl->visual, gl->pixmap ); + gl->drawable = pglXCreatePixmap( gdi_display, gl->format->fbconfig, gl->pixmap, NULL ); if (!gl->drawable) XFreePixmap( gdi_display, gl->pixmap ); } } @@ -1522,7 +1522,7 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r if (!mask) break; pix = XCreatePixmap(gdi_display, root_window, changes.width, changes.height, gl->visual->depth); if (!pix) goto done; - glxp = pglXCreateGLXPixmap(gdi_display, gl->visual, pix); + glxp = pglXCreatePixmap(gdi_display, gl->format->fbconfig, pix, NULL ); if (!glxp) { XFreePixmap(gdi_display, pix); @@ -1532,7 +1532,7 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r XFlush( gdi_display ); XFreePixmap(gdi_display, gl->pixmap); - pglXDestroyGLXPixmap(gdi_display, gl->drawable); + pglXDestroyPixmap(gdi_display, gl->drawable); TRACE( "Recreated GL drawable %lx to replace %lx\n", glxp, gl->drawable ); gl->pixmap = pix; @@ -1571,7 +1571,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) break; case DC_GL_PIXMAP_WIN: if (parent != GetDesktopWindow()) goto done; - pglXDestroyGLXPixmap( gdi_display, gl->drawable ); + pglXDestroyPixmap( gdi_display, gl->drawable ); XFreePixmap( gdi_display, gl->pixmap ); break; default:

1 0

Francois Gouget : d3d9/tests: Fix a trailing ok() '\n'.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: c000733e90614f187a5dcfcf5d6ecf6bae0567a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c000733e90614f187a5dcfcf5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:43:05 2016 +0200 d3d9/tests: Fix a trailing ok() '\n'. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 71af012..1af9d18 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2891,7 +2891,7 @@ static void test_draw_primitive(void) ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "EndScene failed, hr %#x.n", hr); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr);

1 0