wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Lauri Kenttä : winefile: Fix horizontal scrolling.
by Alexandre Julliard 31 May '16

31 May '16

Module: wine Branch: master Commit: c1ab903f22d267abd6186ae4f5e1c856027bae31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ab903f22d267abd6186ae4f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon May 30 20:42:53 2016 +0300 winefile: Fix horizontal scrolling. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index f8247a7..5709c8e 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -118,6 +118,7 @@ typedef struct { #define COLUMNS 10 int widths[COLUMNS]; + int widths_shown[COLUMNS]; int positions[COLUMNS+1]; BOOL treePane; @@ -2355,6 +2356,7 @@ static HWND create_header(HWND parent, Pane* pane, UINT id) hdi.pszText = g_pos_names[idx]; hdi.fmt = HDF_STRING | g_pos_align[idx]; hdi.cxy = pane->widths[idx]; + pane->widths_shown[idx] = hdi.cxy; SendMessageW(hwnd, HDM_INSERTITEMW, idx, (LPARAM)&hdi); } @@ -3168,17 +3170,20 @@ static void set_header(Pane* pane) for(; (i < COLUMNS) && (x+pane->widths[i] < scroll_pos); i++) { x += pane->widths[i]; + pane->widths_shown[i] = item.cxy; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); } if (i < COLUMNS) { x += pane->widths[i]; item.cxy = x - scroll_pos; + pane->widths_shown[i] = item.cxy; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i++, (LPARAM)&item); for(; i < COLUMNS; i++) { item.cxy = pane->widths[i]; x += pane->widths[i]; + pane->widths_shown[i] = item.cxy; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); } } @@ -3190,13 +3195,14 @@ static LRESULT pane_notify(Pane* pane, NMHDR* pnmh) case HDN_ITEMCHANGEDW: { LPNMHEADERW phdn = (LPNMHEADERW)pnmh; int idx = phdn->iItem; - int dx = phdn->pitem->cxy - pane->widths[idx]; + int dx = phdn->pitem->cxy - pane->widths_shown[idx]; int i; RECT clnt; GetClientRect(pane->hwnd, &clnt); pane->widths[idx] += dx; + pane->widths_shown[idx] += dx; for(i=idx; ++i<=COLUMNS; ) pane->positions[i] += dx;

1 0

Paul Gofman : d3dx9/tests: Add test for IsParameterUsed function.
by Alexandre Julliard 31 May '16

31 May '16

Module: wine Branch: master Commit: 571119a585c929fcada80dfab88ed0d9311f2355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571119a585c929fcada80dfab… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu May 26 21:18:37 2016 +0300 d3dx9/tests: Add test for IsParameterUsed function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 539 ++++++++++++++++++++++++++----------------- 1 file changed, 323 insertions(+), 216 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=571119a585c929fcada80…

1 0

Paul Gofman : d3dx9: Implement IsParameterUsed function in effect.
by Alexandre Julliard 31 May '16

31 May '16

Module: wine Branch: master Commit: fe1a89d14f43f2a56ec05bae475b6496dafd681b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1a89d14f43f2a56ec05bae4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu May 26 21:18:36 2016 +0300 d3dx9: Implement IsParameterUsed function in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 109 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7d5e612..7772406 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -188,6 +188,8 @@ static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_sta const char *data, const char **ptr, struct d3dx_object *objects); static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child); +typedef BOOL (*walk_parameter_dep_func)(void *data, struct d3dx_parameter *param); + static const struct { enum STATE_CLASS class; @@ -3545,15 +3547,119 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect* iface, return E_NOTIMPL; } +static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func, + void *data); + +static BOOL walk_param_eval_dep(struct d3dx_param_eval *param_eval, walk_parameter_dep_func param_func, + void *data) +{ + struct d3dx_parameter **params; + unsigned int i, param_count; + + if (!param_eval) + return FALSE; + + params = param_eval->shader_inputs.inputs_param; + param_count = param_eval->shader_inputs.input_count; + for (i = 0; i < param_count; ++i) + { + if (walk_parameter_dep(params[i], param_func, data)) + return TRUE; + } + + params = param_eval->pres.inputs.inputs_param; + param_count = param_eval->pres.inputs.input_count; + for (i = 0; i < param_count; ++i) + { + if (walk_parameter_dep(params[i], param_func, data)) + return TRUE; + } + return FALSE; +} + +static BOOL walk_state_dep(struct d3dx_state *state, walk_parameter_dep_func param_func, + void *data) +{ + if (state->type == ST_CONSTANT && is_param_type_sampler(state->parameter.type)) + { + if (walk_parameter_dep(&state->parameter, param_func, data)) + return TRUE; + } + else if (state->type == ST_ARRAY_SELECTOR || state->type == ST_PARAMETER) + { + if (walk_parameter_dep(state->parameter.referenced_param, param_func, data)) + return TRUE; + } + return walk_param_eval_dep(state->parameter.param_eval, param_func, data); +} + +static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func, + void *data) +{ + unsigned int i; + unsigned int member_count; + + if (param_func(data, param)) + return TRUE; + + if (walk_param_eval_dep(param->param_eval, param_func, data)) + return TRUE; + + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + struct d3dx_sampler *sampler; + + sampler = (struct d3dx_sampler *)param->data; + for (i = 0; i < sampler->state_count; ++i) + { + if (walk_state_dep(&sampler->states[i], param_func, data)) + return TRUE; + } + return FALSE; + } + + member_count = param->element_count ? param->element_count : param->member_count; + for (i = 0; i < member_count; ++i) + { + if (walk_param_eval_dep(param->members[i].param_eval, param_func, data)) + return TRUE; + } + + return FALSE; +} + +static BOOL compare_param_ptr(void *param_comp, struct d3dx_parameter *param) +{ + return param_comp == param; +} + static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + unsigned int i, j; struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); + struct d3dx_pass *pass; - FIXME("iface %p, parameter %p, technique %p stub.\n", iface, parameter, technique); - TRACE("param %p (%s).\n", param, param ? debugstr_a(param->name) : ""); + TRACE("iface %p, parameter %p, technique %p.\n", iface, parameter, technique); + TRACE("param %p, name %s, tech %p.\n", param, param ? debugstr_a(param->name) : "", tech); + if (!tech || !param) + return FALSE; - return TRUE; + for (i = 0; i < tech->pass_count; ++i) + { + pass = &tech->passes[i]; + for (j = 0; j < pass->state_count; ++j) + { + if (walk_state_dep(&pass->states[j], compare_param_ptr, param)) + { + TRACE("Returning TRUE.\n"); + return TRUE; + } + } + } + TRACE("Returning FALSE.\n"); + return FALSE; } static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags)

1 0

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

31 May '16

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 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

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

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

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

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

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

30 May '16

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

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-commits May 2016