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

Andrey Gusev : wineps.drv: Fix typos.
by Alexandre Julliard 31 May '16

31 May '16

Module: wine Branch: master Commit: 4baef89f66aee501b788177ca80d9122cc411b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4baef89f66aee501b788177ca… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 26 18:15:27 2016 +0300 wineps.drv: Fix typos. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/data/COPYRIGHTS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/data/COPYRIGHTS b/dlls/wineps.drv/data/COPYRIGHTS index b5d4f63..5d3fa79 100644 --- a/dlls/wineps.drv/data/COPYRIGHTS +++ b/dlls/wineps.drv/data/COPYRIGHTS @@ -19,7 +19,7 @@ International Typeface Corporation. Windows metrics derived from Century Gothic Bold. Typeface copyright The Monotype Corporation plc. Data copyright The Monotype Corporation plc/Type -Solutions Inc. 1990-1991. All rights reserved. Centyry Gothic is a trademark +Solutions Inc. 1990-1991. All rights reserved. Century Gothic is a trademark of The Monotype Corporation plc. @@ -155,7 +155,7 @@ reserved. Helvetica is a trademark of Linotype AG and/or its subsidiaries. Windows metrics derived from Arial. Typeface copyright The Monotype Corporation plc. Data copyright The Monotype Corporation plc/Type Solutions Inc. 1990-1992. All rights reserved. Arial is a registered trademark of The Monotype -Corporation plc, registered in the United Stated Patent and Trademark Office and +Corporation plc, registered in the United States Patent and Trademark Office and elsewhere.

1 0

Francois Gouget : ole32: Spelling fixes.
by Alexandre Julliard 31 May '16

31 May '16

Module: wine Branch: master Commit: e0a9e5ae26f888af90b6e0ed7b7a977e94e2cf7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a9e5ae26f888af90b6e0ed7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:41:43 2016 +0200 ole32: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 2 +- dlls/ole32/compobj.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b871bbc..2cc1cfa 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1818,7 +1818,7 @@ void OLEClipbrd_UnInitialize(void) * * Enumerate all formats supported by the source and make * those formats available using delayed rendering using SetClipboardData. - * Cache the enumeration list and make that list visibile as the + * Cache the enumeration list and make that list visible as the * 'Ole Private Data' format on the clipboard. * */ diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ced6f7d..9050f0a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4989,8 +4989,8 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) context->IComThreadingInfo_iface.lpVtbl = &Context_Threading_Vtbl; context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; - /* Context token does not take a reference, it's always zero until - interface is explicitely requested with CoGetObjectContext(). */ + /* Context token does not take a reference, it's always zero until the + interface is explicitly requested with CoGetObjectContext(). */ context->refs = 0; info->context_token = &context->IObjContext_iface;

1 0

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

31 May '16

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

Nikolay Sivov : user32/tests: Fix a leak when creating test icons ( Valgrind).
by Alexandre Julliard 31 May '16

31 May '16

Module: wine Branch: master Commit: 59ee884bdf4947f5939499456539fca7a5806939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ee884bdf4947f5939499456… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 14:43:22 2016 +0300 user32/tests: Fix a leak when creating test icons (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 5138c56..5f2306a 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1192,6 +1192,8 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes ret = WriteFile(file, buf, icon_size, &bytes_written, NULL); ok(ret && bytes_written == icon_size, "icon.ico created improperly.\n"); CloseHandle(file); + + HeapFree(GetProcessHeap(), 0, buf); } static void test_LoadImage(void)

1 0

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

31 May '16

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 31 May '16

31 May '16

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

Hadrien Boizard : msvcrt: Use BOOL type where appropriate.
by Alexandre Julliard 31 May '16

31 May '16

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

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

30 May '16

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

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

30 May '16

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

Jacek Caban : msctf: Don't call ITextStoreACP:: UnadviseSink in context destructor.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 79025d0e6af8189fd6c3360c5bd335954124c205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79025d0e6af8189fd6c3360c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:24 2016 +0200 msctf: Don't call ITextStoreACP::UnadviseSink in context destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/context.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 597706e..54052f6 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -119,10 +119,7 @@ static void Context_Destructor(Context *This) TRACE("destroying %p\n", This); if (This->pITextStoreACP) - { - ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)&This->ITextStoreACPSink_iface); ITextStoreACP_Release(This->pITextStoreACP); - } if (This->pITfContextOwnerCompositionSink) ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink);

1 0