November 2015 - Wine-Devel - list.winehq.org

Re: [PATCH] winex11: Avoid double initialization of variables in OpenGL functions.
by Matteo Bruni Nov. 4, 2015

Nov. 4, 2015

2015-11-04 20:52 GMT+01:00 Alex Henrie <alexhenrie24(a)gmail.com>: > 2015-11-04 12:22 GMT-07:00 Vincent Povirk <vincent(a)codeweavers.com>: >> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> >> >> Although I don't see anything wrong with 'get_render_type_from_fbconfig' as-is. > > I moved the render_type = 0 assignment into a conditional branch. If > there was not a default case in that function already, it would not > have made a difference, because a jump instruction takes the same > amount of time or more as zeroing out a variable. But since we already > have the conditional, it makes more sense to move the initialization > into that conditional branch to avoid the cost of initializing the > variable unnecessarily. I doubt that actually modifies the generated code, although that's probably true for all the changes in this patch. The other changes at least simplify the code a bit. Anyway, the patch is okay with me FWIW.

1 0

Re: [PATCH] winex11: Avoid double initialization of variables in OpenGL functions.
by Stefan Dösinger Nov. 4, 2015

Nov. 4, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi Alex, Your diff appears to have a huge amount of context around the changes. Is that intentional? Stefan Am 2015-11-04 um 06:15 schrieb Alex Henrie: > Cc: Vincent Povirk <vincent(a)codeweavers.com> > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/winex11.drv/opengl.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c > index 7b8ba82..99befde 100644 > --- a/dlls/winex11.drv/opengl.c > +++ b/dlls/winex11.drv/opengl.c > @@ -947,124 +947,125 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ > case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV: > case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV: > case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV: > case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV: > pop = iWGLAttr[++cur]; > /** cannot be converted, see direct handling on > * - wglGetPixelFormatAttribivARB > * TODO: wglChoosePixelFormat > */ > break ; > case WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT: > pop = iWGLAttr[++cur]; > PUSH2(oGLXAttr, GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT, pop); > TRACE("pAttr[%d] = GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT: %x\n", cur, pop); > break ; > > case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: > pop = iWGLAttr[++cur]; > PUSH2(oGLXAttr, GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT, pop); > TRACE("pAttr[%d] = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT: %x\n", cur, pop); > break ; > default: > FIXME("unsupported %x WGL Attribute\n", iWGLAttr[cur]); > cur++; > break; > } > ++cur; > } > > /* By default glXChooseFBConfig defaults to GLX_WINDOW_BIT. wglChoosePixelFormatARB searches through > * all formats. Unless drawattrib is set to a non-zero value override it with GLX_DONT_CARE, so that > * pixmap and pbuffer formats appear as well. */ > if (!drawattrib) drawattrib = GLX_DONT_CARE; > PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, drawattrib); > TRACE("pAttr[?] = GLX_DRAWABLE_TYPE: %#x\n", drawattrib); > > /* By default glXChooseFBConfig uses GLX_RGBA_BIT as the default value. Since wglChoosePixelFormatARB > * searches in all formats we have to do the same. For this reason we set GLX_RENDER_TYPE to > * GLX_DONT_CARE unless it is overridden. */ > PUSH2(oGLXAttr, GLX_RENDER_TYPE, pixelattrib); > TRACE("pAttr[?] = GLX_RENDER_TYPE: %#x\n", pixelattrib); > > /* Set GLX_FLOAT_COMPONENTS_NV all the time */ > if (has_extension(WineGLInfo.glxExtensions, "GLX_NV_float_buffer")) { > PUSH2(oGLXAttr, GLX_FLOAT_COMPONENTS_NV, nvfloatattrib); > TRACE("pAttr[?] = GLX_FLOAT_COMPONENTS_NV: %#x\n", nvfloatattrib); > } > > return nAttribs; > } > > static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) > { > - int render_type=0, render_type_bit; > + int render_type, render_type_bit; > pglXGetFBConfigAttrib(display, fbconfig, GLX_RENDER_TYPE, &render_type_bit); > switch(render_type_bit) > { > case GLX_RGBA_BIT: > render_type = GLX_RGBA_TYPE; > break; > case GLX_COLOR_INDEX_BIT: > render_type = GLX_COLOR_INDEX_TYPE; > break; > case GLX_RGBA_FLOAT_BIT: > render_type = GLX_RGBA_FLOAT_TYPE; > break; > case GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT: > render_type = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT; > break; > default: > ERR("Unknown render_type: %x\n", render_type_bit); > + render_type = 0; > } > return render_type; > } > > /* Check whether a fbconfig is suitable for Windows-style bitmap rendering */ > static BOOL check_fbconfig_bitmap_capability(Display *display, GLXFBConfig fbconfig) > { > int dbuf, value; > pglXGetFBConfigAttrib(display, fbconfig, GLX_DOUBLEBUFFER, &dbuf); > pglXGetFBConfigAttrib(gdi_display, fbconfig, GLX_DRAWABLE_TYPE, &value); > > /* Windows only supports bitmap rendering on single buffered formats, further the fbconfig needs to have > * the GLX_PIXMAP_BIT set. */ > return !dbuf && (value & GLX_PIXMAP_BIT); > } > > static void init_pixel_formats( Display *display ) > { > struct wgl_pixel_format *list; > int size = 0, onscreen_size = 0; > int fmt_id, nCfgs, i, run, bmp_formats; > GLXFBConfig* cfgs; > XVisualInfo *visinfo; > > cfgs = pglXGetFBConfigs(display, DefaultScreen(display), &nCfgs); > if (NULL == cfgs || 0 == nCfgs) { > if(cfgs != NULL) XFree(cfgs); > ERR("glXChooseFBConfig returns NULL\n"); > return; > } > > /* Bitmap rendering on Windows implies the use of the Microsoft GDI software renderer. > * Further most GLX drivers only offer pixmap rendering using indirect rendering (except for modern drivers which support 'AIGLX' / composite). > * Indirect rendering can indicate software rendering (on Nvidia it is hw accelerated) > * Since bitmap rendering implies the use of software rendering we can safely use indirect rendering for bitmaps. > * > * Below we count the number of formats which are suitable for bitmap rendering. Windows restricts bitmap rendering to single buffered formats. > */ > for(i=0, bmp_formats=0; i<nCfgs; i++) > { > if(check_fbconfig_bitmap_capability(display, cfgs[i])) > bmp_formats++; > } > TRACE("Found %d bitmap capable fbconfigs\n", bmp_formats); > > list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nCfgs + bmp_formats) * sizeof(*list)); > > /* Fill the pixel format list. Put onscreen formats at the top and offscreen ones at the bottom. > * Do this as GLX doesn't guarantee that the list is sorted */ > for(run=0; run < 2; run++) > { > for(i=0; i<nCfgs; i++) { > pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &fmt_id); > @@ -1737,107 +1738,107 @@ static int glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat, > if (TRACE_ON(wgl)) { > dump_PIXELFORMATDESCRIPTOR(ppfd); > } > > return nb_onscreen_formats; > } > > /*********************************************************************** > * glxdrv_wglGetPixelFormat > */ > static int glxdrv_wglGetPixelFormat( HDC hdc ) > { > struct gl_drawable *gl; > int ret = 0; > > if ((gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) > { > ret = pixel_format_index( gl->format ); > /* Offscreen formats can't be used with traditional WGL calls. > * As has been verified on Windows GetPixelFormat doesn't fail but returns iPixelFormat=1. */ > if (!is_onscreen_pixel_format( ret )) ret = 1; > release_gl_drawable( gl ); > } > TRACE( "%p -> %d\n", hdc, ret ); > return ret; > } > > /*********************************************************************** > * glxdrv_wglSetPixelFormat > */ > static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd ) > { > return set_pixel_format(hdc, iPixelFormat, FALSE); > } > > /*********************************************************************** > * glxdrv_wglCopyContext > */ > static BOOL glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *dst, UINT mask) > { > TRACE("%p -> %p mask %#x\n", src, dst, mask); > > pglXCopyContext(gdi_display, src->ctx, dst->ctx, mask); > > /* As opposed to wglCopyContext, glXCopyContext doesn't return anything, so hopefully we passed */ > return TRUE; > } > > /*********************************************************************** > * glxdrv_wglCreateContext > */ > static struct wgl_context *glxdrv_wglCreateContext( HDC hdc ) > { > - struct wgl_context *ret = NULL; > + struct wgl_context *ret; > struct gl_drawable *gl; > > if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) > { > SetLastError( ERROR_INVALID_PIXEL_FORMAT ); > return NULL; > } > > if ((ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) > { > ret->hdc = hdc; > ret->fmt = gl->format; > ret->vis = pglXGetVisualFromFBConfig(gdi_display, gl->format->fbconfig); > ret->ctx = create_glxcontext(gdi_display, ret, NULL); > list_add_head( &context_list, &ret->entry ); > } > release_gl_drawable( gl ); > TRACE( "%p -> %p\n", hdc, ret ); > return ret; > } > > /*********************************************************************** > * glxdrv_wglDeleteContext > */ > static void glxdrv_wglDeleteContext(struct wgl_context *ctx) > { > TRACE("(%p)\n", ctx); > > EnterCriticalSection( &context_section ); > list_remove( &ctx->entry ); > LeaveCriticalSection( &context_section ); > > if (ctx->ctx) pglXDestroyContext( gdi_display, ctx->ctx ); > if (ctx->vis) XFree( ctx->vis ); > HeapFree( GetProcessHeap(), 0, ctx ); > } > > /*********************************************************************** > * glxdrv_wglGetProcAddress > */ > static PROC glxdrv_wglGetProcAddress(LPCSTR lpszProc) > { > if (!strncmp(lpszProc, "wgl", 3)) return NULL; > return pglXGetProcAddressARB((const GLubyte*)lpszProc); > } > > /*********************************************************************** > * glxdrv_wglMakeCurrent > */ > static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) > { > BOOL ret = FALSE; > struct gl_drawable *gl; > @@ -1987,205 +1988,205 @@ 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; > default: break; > } > sync_context(ctx); > release_gl_drawable( gl ); > } > > pglFinish(); > if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); > } > > static void wglFlush(void) > { > struct x11drv_escape_flush_gl_drawable escape; > struct gl_drawable *gl; > struct wgl_context *ctx = NtCurrentTeb()->glContext; > > escape.code = X11DRV_FLUSH_GL_DRAWABLE; > escape.gl_drawable = 0; > > if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) > { > 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; > default: break; > } > sync_context(ctx); > release_gl_drawable( gl ); > } > > pglFlush(); > if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); > } > > static const GLubyte *wglGetString(GLenum name) > { > if (name == GL_EXTENSIONS && WineGLInfo.glExtensions) > return (const GLubyte *)WineGLInfo.glExtensions; > return pglGetString(name); > } > > /*********************************************************************** > * X11DRV_wglCreateContextAttribsARB > */ > static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wgl_context *hShareContext, > const int* attribList ) > { > - struct wgl_context *ret = NULL; > + struct wgl_context *ret; > struct gl_drawable *gl; > int err = 0; > > TRACE("(%p %p %p)\n", hdc, hShareContext, attribList); > > if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) > { > SetLastError( ERROR_INVALID_PIXEL_FORMAT ); > return NULL; > } > > if ((ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) > { > ret->hdc = hdc; > ret->fmt = gl->format; > ret->vis = NULL; /* glXCreateContextAttribsARB requires a fbconfig instead of a visual */ > ret->gl3_context = TRUE; > if (attribList) > { > int *pContextAttribList = &ret->attribList[0]; > /* attribList consists of pairs {token, value] terminated with 0 */ > while(attribList[0] != 0) > { > TRACE("%#x %#x\n", attribList[0], attribList[1]); > switch(attribList[0]) > { > case WGL_CONTEXT_MAJOR_VERSION_ARB: > pContextAttribList[0] = GLX_CONTEXT_MAJOR_VERSION_ARB; > pContextAttribList[1] = attribList[1]; > pContextAttribList += 2; > ret->numAttribs++; > break; > case WGL_CONTEXT_MINOR_VERSION_ARB: > pContextAttribList[0] = GLX_CONTEXT_MINOR_VERSION_ARB; > pContextAttribList[1] = attribList[1]; > pContextAttribList += 2; > ret->numAttribs++; > break; > case WGL_CONTEXT_LAYER_PLANE_ARB: > break; > case WGL_CONTEXT_FLAGS_ARB: > pContextAttribList[0] = GLX_CONTEXT_FLAGS_ARB; > pContextAttribList[1] = attribList[1]; > pContextAttribList += 2; > ret->numAttribs++; > break; > case WGL_CONTEXT_PROFILE_MASK_ARB: > pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; > pContextAttribList[1] = attribList[1]; > pContextAttribList += 2; > ret->numAttribs++; > break; > default: > ERR("Unhandled attribList pair: %#x %#x\n", attribList[0], attribList[1]); > } > attribList += 2; > } > } > > X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); > ret->ctx = create_glxcontext(gdi_display, ret, hShareContext ? hShareContext->ctx : NULL); > XSync(gdi_display, False); > if ((err = X11DRV_check_error()) || !ret->ctx) > { > /* In the future we should convert the GLX error to a win32 one here if needed */ > ERR("Context creation failed (error %x)\n", err); > HeapFree( GetProcessHeap(), 0, ret ); > ret = NULL; > } > else list_add_head( &context_list, &ret->entry ); > } > > release_gl_drawable( gl ); > TRACE( "%p -> %p\n", hdc, ret ); > return ret; > } > > /** > * X11DRV_wglGetExtensionsStringARB > * > * WGL_ARB_extensions_string: wglGetExtensionsStringARB > */ > static const char *X11DRV_wglGetExtensionsStringARB(HDC hdc) > { > TRACE("() returning \"%s\"\n", WineGLInfo.wglExtensions); > return WineGLInfo.wglExtensions; > } > > /** > * X11DRV_wglCreatePbufferARB > * > * WGL_ARB_pbuffer: wglCreatePbufferARB > */ > static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat, int iWidth, int iHeight, > const int *piAttribList ) > { > - struct wgl_pbuffer* object = NULL; > - const struct wgl_pixel_format *fmt = NULL; > + struct wgl_pbuffer* object; > + const struct wgl_pixel_format *fmt; > int attribs[256]; > int nAttribs = 0; > > TRACE("(%p, %d, %d, %d, %p)\n", hdc, iPixelFormat, iWidth, iHeight, piAttribList); > > /* Convert the WGL pixelformat to a GLX format, if it fails then the format is invalid */ > fmt = get_pixel_format(gdi_display, iPixelFormat, TRUE /* Offscreen */); > if(!fmt) { > ERR("(%p): invalid pixel format %d\n", hdc, iPixelFormat); > SetLastError(ERROR_INVALID_PIXEL_FORMAT); > return NULL; > } > > object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); > if (NULL == object) { > SetLastError(ERROR_NO_SYSTEM_RESOURCES); > return NULL; > } > object->width = iWidth; > object->height = iHeight; > object->fmt = fmt; > > PUSH2(attribs, GLX_PBUFFER_WIDTH, iWidth); > PUSH2(attribs, GLX_PBUFFER_HEIGHT, iHeight); > while (piAttribList && 0 != *piAttribList) { > int attr_v; > switch (*piAttribList) { > case WGL_PBUFFER_LARGEST_ARB: { > ++piAttribList; > attr_v = *piAttribList; > TRACE("WGL_LARGEST_PBUFFER_ARB = %d\n", attr_v); > PUSH2(attribs, GLX_LARGEST_PBUFFER, attr_v); > break; > } > > case WGL_TEXTURE_FORMAT_ARB: { > ++piAttribList; > attr_v = *piAttribList; > TRACE("WGL_render_texture Attribute: WGL_TEXTURE_FORMAT_ARB as %x\n", attr_v); > if (WGL_NO_TEXTURE_ARB == attr_v) { > object->use_render_texture = 0; > } else { > if (!use_render_texture_emulation) { > SetLastError(ERROR_INVALID_DATA); > goto create_failed; > } > switch (attr_v) { > case WGL_TEXTURE_RGB_ARB: > object->use_render_texture = GL_RGB; > object->texture_bpp = 3; > object->texture_format = GL_RGB; > object->texture_type = GL_UNSIGNED_BYTE; > break; > @@ -2457,213 +2458,213 @@ static BOOL X11DRV_wglQueryPbufferARB( struct wgl_pbuffer *object, int iAttribut > * WGL_ARB_pbuffer: wglReleasePbufferDCARB > */ > static int X11DRV_wglReleasePbufferDCARB( struct wgl_pbuffer *object, HDC hdc ) > { > struct gl_drawable *gl; > > TRACE("(%p, %p)\n", object, hdc); > > EnterCriticalSection( &context_section ); > > if (!XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&gl )) > { > XDeleteContext( gdi_display, (XID)hdc, gl_pbuffer_context ); > free_gl_drawable( gl ); > } > else hdc = 0; > > LeaveCriticalSection( &context_section ); > > return hdc && DeleteDC(hdc); > } > > /** > * X11DRV_wglSetPbufferAttribARB > * > * WGL_ARB_pbuffer: wglSetPbufferAttribARB > */ > static BOOL X11DRV_wglSetPbufferAttribARB( struct wgl_pbuffer *object, const int *piAttribList ) > { > GLboolean ret = GL_FALSE; > > WARN("(%p, %p): alpha-testing, report any problem\n", object, piAttribList); > > if (!object->use_render_texture) { > SetLastError(ERROR_INVALID_HANDLE); > return GL_FALSE; > } > if (use_render_texture_emulation) { > return GL_TRUE; > } > return ret; > } > > /** > * X11DRV_wglChoosePixelFormatARB > * > * WGL_ARB_pixel_format: wglChoosePixelFormatARB > */ > static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, > UINT nMaxFormats, int *piFormats, UINT *nNumFormats ) > { > int attribs[256]; > int nAttribs = 0; > - GLXFBConfig* cfgs = NULL; > + GLXFBConfig* cfgs; > int nCfgs = 0; > int it; > int fmt_id; > int start, end; > UINT pfmt_it = 0; > int run; > int i; > DWORD dwFlags = 0; > > TRACE("(%p, %p, %p, %d, %p, %p): hackish\n", hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats); > if (NULL != pfAttribFList) { > FIXME("unused pfAttribFList\n"); > } > > nAttribs = ConvertAttribWGLtoGLX(piAttribIList, attribs, NULL); > if (-1 == nAttribs) { > WARN("Cannot convert WGL to GLX attributes\n"); > return GL_FALSE; > } > PUSH1(attribs, None); > > /* There is no 1:1 mapping between GLX and WGL formats because we duplicate some GLX formats for bitmap rendering (see get_formats). > * Flags like PFD_SUPPORT_GDI, PFD_DRAW_TO_BITMAP and others are a property of the pixel format. We don't query these attributes > * using glXChooseFBConfig but we filter the result of glXChooseFBConfig later on. > */ > for(i=0; piAttribIList[i] != 0; i+=2) > { > switch(piAttribIList[i]) > { > case WGL_DRAW_TO_BITMAP_ARB: > if(piAttribIList[i+1]) > dwFlags |= PFD_DRAW_TO_BITMAP; > break; > case WGL_ACCELERATION_ARB: > switch(piAttribIList[i+1]) > { > case WGL_NO_ACCELERATION_ARB: > dwFlags |= PFD_GENERIC_FORMAT; > break; > case WGL_GENERIC_ACCELERATION_ARB: > dwFlags |= PFD_GENERIC_ACCELERATED; > break; > case WGL_FULL_ACCELERATION_ARB: > /* Nothing to do */ > break; > } > break; > case WGL_SUPPORT_GDI_ARB: > if(piAttribIList[i+1]) > dwFlags |= PFD_SUPPORT_GDI; > break; > } > } > > /* Search for FB configurations matching the requirements in attribs */ > cfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), attribs, &nCfgs); > if (NULL == cfgs) { > WARN("Compatible Pixel Format not found\n"); > return GL_FALSE; > } > > /* Loop through all matching formats and check if they are suitable. > * Note that this function should at max return nMaxFormats different formats */ > for(run=0; run < 2; run++) > { > for (it = 0; it < nCfgs && pfmt_it < nMaxFormats; ++it) > { > if (pglXGetFBConfigAttrib(gdi_display, cfgs[it], GLX_FBCONFIG_ID, &fmt_id)) > { > ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); > continue; > } > > /* During the first run we only want onscreen formats and during the second only offscreen */ > start = run == 1 ? nb_onscreen_formats : 0; > end = run == 1 ? nb_pixel_formats : nb_onscreen_formats; > > for (i = start; i < end; i++) > { > if (pixel_formats[i].fmt_id == fmt_id && (pixel_formats[i].dwFlags & dwFlags) == dwFlags) > { > piFormats[pfmt_it++] = i + 1; > TRACE("at %d/%d found FBCONFIG_ID 0x%x (%d)\n", > it + 1, nCfgs, fmt_id, i + 1); > break; > } > } > } > } > > *nNumFormats = pfmt_it; > /** free list */ > XFree(cfgs); > return GL_TRUE; > } > > /** > * X11DRV_wglGetPixelFormatAttribivARB > * > * WGL_ARB_pixel_format: wglGetPixelFormatAttribivARB > */ > static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int iLayerPlane, > UINT nAttributes, const int *piAttributes, int *piValues ) > { > UINT i; > - const struct wgl_pixel_format *fmt = NULL; > + const struct wgl_pixel_format *fmt; > int hTest; > int tmp; > int curGLXAttr = 0; > > TRACE("(%p, %d, %d, %d, %p, %p)\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, piValues); > > if (0 < iLayerPlane) { > FIXME("unsupported iLayerPlane(%d) > 0, returns FALSE\n", iLayerPlane); > return GL_FALSE; > } > > /* Convert the WGL pixelformat to a GLX one, if this fails then most likely the iPixelFormat isn't supported. > * We don't have to fail yet as a program can specify an invalid iPixelFormat (lets say 0) if it wants to query > * the number of supported WGL formats. Whether the iPixelFormat is valid is handled in the for-loop below. */ > fmt = get_pixel_format(gdi_display, iPixelFormat, TRUE /* Offscreen */); > if(!fmt) { > WARN("Unable to convert iPixelFormat %d to a GLX one!\n", iPixelFormat); > } > > for (i = 0; i < nAttributes; ++i) { > const int curWGLAttr = piAttributes[i]; > TRACE("pAttr[%d] = %x\n", i, curWGLAttr); > > switch (curWGLAttr) { > case WGL_NUMBER_PIXEL_FORMATS_ARB: > piValues[i] = nb_pixel_formats; > continue; > > case WGL_SUPPORT_OPENGL_ARB: > piValues[i] = GL_TRUE; > continue; > > case WGL_ACCELERATION_ARB: > curGLXAttr = GLX_CONFIG_CAVEAT; > if (!fmt) goto pix_error; > if(fmt->dwFlags & PFD_GENERIC_FORMAT) > piValues[i] = WGL_NO_ACCELERATION_ARB; > else if(fmt->dwFlags & PFD_GENERIC_ACCELERATED) > piValues[i] = WGL_GENERIC_ACCELERATION_ARB; > else > piValues[i] = WGL_FULL_ACCELERATION_ARB; > continue; > > case WGL_TRANSPARENT_ARB: > curGLXAttr = GLX_TRANSPARENT_TYPE; > if (!fmt) goto pix_error; > hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, curGLXAttr, &tmp); > if (hTest) goto get_error; > piValues[i] = GL_FALSE; > if (GLX_NONE != tmp) piValues[i] = GL_TRUE; > continue; > > case WGL_PIXEL_TYPE_ARB: > @@ -2979,107 +2980,107 @@ static BOOL X11DRV_wglReleaseTexImageARB( struct wgl_pbuffer *object, int iBuffe > return GL_TRUE; > } > return ret; > } > > /** > * X11DRV_wglGetExtensionsStringEXT > * > * WGL_EXT_extensions_string: wglGetExtensionsStringEXT > */ > static const char *X11DRV_wglGetExtensionsStringEXT(void) > { > TRACE("() returning \"%s\"\n", WineGLInfo.wglExtensions); > return WineGLInfo.wglExtensions; > } > > /** > * X11DRV_wglGetSwapIntervalEXT > * > * WGL_EXT_swap_control: wglGetSwapIntervalEXT > */ > static int X11DRV_wglGetSwapIntervalEXT(void) > { > struct wgl_context *ctx = NtCurrentTeb()->glContext; > struct gl_drawable *gl; > int swap_interval; > > TRACE("()\n"); > > if (!(gl = get_gl_drawable( WindowFromDC( ctx->hdc ), ctx->hdc ))) > { > /* This can't happen because a current WGL context is required to get > * here. Likely the application is buggy. > */ > WARN("No GL drawable found, returning swap interval 0\n"); > return 0; > } > > swap_interval = gl->swap_interval; > release_gl_drawable(gl); > > return swap_interval; > } > > /** > * X11DRV_wglSwapIntervalEXT > * > * WGL_EXT_swap_control: wglSwapIntervalEXT > */ > static BOOL X11DRV_wglSwapIntervalEXT(int interval) > { > struct wgl_context *ctx = NtCurrentTeb()->glContext; > struct gl_drawable *gl; > - BOOL ret = TRUE; > + BOOL ret; > > TRACE("(%d)\n", interval); > > /* Without WGL/GLX_EXT_swap_control_tear a negative interval > * is invalid. > */ > if (interval < 0 && !has_swap_control_tear) > { > SetLastError(ERROR_INVALID_DATA); > return FALSE; > } > > if (!(gl = get_gl_drawable( WindowFromDC( ctx->hdc ), ctx->hdc ))) > { > SetLastError(ERROR_DC_NOT_FOUND); > return FALSE; > } > > ret = set_swap_interval(gl->drawable, interval); > gl->refresh_swap_interval = FALSE; > if (ret) > gl->swap_interval = interval; > else > SetLastError(ERROR_DC_NOT_FOUND); > > release_gl_drawable(gl); > > return ret; > } > > /** > * X11DRV_wglSetPixelFormatWINE > * > * WGL_WINE_pixel_format_passthrough: wglSetPixelFormatWINE > * This is a WINE-specific wglSetPixelFormat which can set the pixel format multiple times. > */ > static BOOL X11DRV_wglSetPixelFormatWINE(HDC hdc, int format) > { > return set_pixel_format(hdc, format, TRUE); > } > > /** > * glxRequireVersion (internal) > * > * Check if the supported GLX version matches requiredVersion. > */ > static BOOL glxRequireVersion(int requiredVersion) > { > /* Both requiredVersion and glXVersion[1] contains the minor GLX version */ > if(requiredVersion <= WineGLInfo.glxVersion[1]) > return TRUE; > > return FALSE; > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWOdT4AAoJEN0/YqbEcdMwrKMP/3A3YDS+Z8D9DryqO0M+uGFb dpXvi5pCXIir7VK12bO57tj3NTZ0i9R+COfmwFTb883e6MdcIDsMd3+w8o0A/vj0 7U5yZuxE0gWkFL2veP2L7q+nx7NInYEaWuKmm/Ilu0vDQV0Azr3oyETyih2VZdxE WqXvh/V90JeFBXf6QtyrPRczXdjcP5BMlI3LW7xLTg4lrxGv3E6r/2wOFl87Ezo1 zHQ8ZF+BWtK2m5vz6OZBoyvPD0XMB+3NJaxfqZ5JI37bJfnO8nu5WyyZEx/6ilxN TuFacVAewVth53Uo9svNOodvZ3hsIP1JILQ4KAOBUbo6/31GIufxGjHdXfzEpRmX Xf3+rBdVPtZO/fwbIJnoMMBZbUB3ysOf+WSsH341fa4XmUgppG0enyLve19HcnUV ZV1yyX+veAdjEjF/bu72XMowPH9yQNR72buwqdxfbVOckeUuIOuyeRjT+VloGQCv Y3FrstuvoCEJCedSGm96zSHhN2sRNeHvCxoRECuivdoo2e8iCXhC+otkKyoH4zN1 cGXVraN+oabyiwe+K2ItWGeiNKp0Es+eQtckYbna7SmbpslkFjhWjju7NaDbJJgS wZq+Na9hYC/zN5Ae921DSegHEuTtjbFBA4JmD54oVYGAK0cA5V88qsEFbkBgH+fp WfiGk1hZGePFQvXm7kiN =H5zR -----END PGP SIGNATURE-----

4 3

Re: [PATCH 2/5] ddraw: check if surface is a mipmap sublevel through caps in ddraw_surface7_GetPriority
by Riccardo Bortolato Nov. 4, 2015

Nov. 4, 2015

Thank you Stefan, I will resubmit with your tests. Ciao, Riccardo 2015-11-04 16:40 GMT+01:00 Marvin <testbot(a)winehq.org>: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch.

1 0

Re: mshtml: Add IHTMLXMLHttpRequest::responseXML() method implementation. (try 2)
by Nikolay Sivov Nov. 4, 2015

Nov. 4, 2015

I don't know if it's terribly important in practice or not, but it could be better to always initialize out pointer to NULL. > + hres = IXMLDOMDocument_QueryInterface(xmldoc, &IID_IObjectSafety, (void**)&safety); > + if(SUCCEEDED(hres)) { > + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, > + INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER, > + INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER); > + IObjectSafety_Release(safety); > + if(FAILED(hres)) { > + ERR("SetInterfaceSafetyOptions(%p) failed: %08x\n", safety, hres); > + IXMLDOMDocument_Release(xmldoc); > + return hres; > + } > + } else { > + ERR("QueryInterface(IID_IObjectSafety) failed: %08x\n", hres); > + IXMLDOMDocument_Release(xmldoc); > + return hres; > + } This looks too complicated to me, I don't think any failure here is critical.

2 2

Re: dinput: Ensure X11 input events are forwarded to wineserver even without message loop.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Sebastian Lackner <sebastian(a)fds-team.de> writes: > This commit basically reverts b22ff8018aca7c365e505f1db7732f7050ae259b. > > Windows does not do that, but our current implementation of winex11 > requires periodic event polling to forward events to the wineserver. > > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > Signed-off-by: Michael Müller <michael(a)fds-team.de> > --- > > NOTES: > > - Breaking the dinput tests is harmless here, because they only work by > "pure accident". I'll add more tests later to show this. Actually they don't fail here: ../../../tools/runtest -q -P wine -T ../../.. -M dinput.dll -p dinput_test.exe.so mouse && touch mouse.ok mouse.c:164: Test succeeded inside todo block: GetDeviceData() failed: 00000000 cnt:1 mouse.c:176: Test succeeded inside todo block: GetDeviceData() failed: 00000000 cnt:1 make: *** [mouse.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ntdll: Block signals while executing system APCs. (v2)
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Sebastian Lackner <sebastian(a)fds-team.de> writes: > Changes in v2: > * Do not delete the still valid comment "Return TRUE if a user APC has been run.". > I still had this deleted from an earlier version of the patchset, where the > return type was changed. > > If a USR1 suspend signal arrives between dequeing a system APC and sending > back the result to the wineserver, a deadlock occurs. To avoid this issue > this patch blocks all signals in server_select(), except while waiting or > processing user APCs. I'm guessing this is for bug 14697? It seems to me you could do that on the server side, by not suspending the thread while system APCs are outstanding. Also a test case demonstrating the bug would be a good first step. -- Alexandre Julliard julliard(a)winehq.org

3 7

Re: [PATCH 1/3] wined3d: Prepare the destination location in surface_load_location.
by Henri Verbeet Nov. 4, 2015

Nov. 4, 2015

On 3 November 2015 at 23:55, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > Instead of its sub-functions. See comments in patch 3 for details about > surface_blt_fbo. > > This fixes bug 39536. surface_load_location didn't prepare the > multisample renderbuffer. > > The next patches will consistently move the responsibility to the caller > of surface_load_location. This isn't necessarily wrong on its own, although I wonder if it's really worth it. I don't think it makes the API easier to use correctly, and I don't think there's going to be much of a performance impact. For fixing bug 39536 this is wrong though. If I'm reading the terminal output there correctly, the issue is that load_location() is called with WINED3D_LOCATION_RB_MULTISAMPLE, which it doesn't know how to handle. This patch will hide the issue by simply always calling prepare_location(). I'd have to check if multisample surfaces are supposed to have defined content after creation and presents, but perhaps what you need to do here is to add proper WINED3D_LOCATION_DISCARDED handling for multisample surfaces, similar to depth stencil surfaces.

2 2

Re: mshtml: Add IHTMLXMLHttpRequest::responseXML() method implementation.
by Nikolay Sivov Nov. 4, 2015

Nov. 4, 2015

On 04.11.2015 11:13, Zhenbo Li wrote: > + hres = IXMLDOMDocument_loadXML(xmldoc, str, &vbool); > + if(FAILED(hres)) { > + ERR("loadXML(%s) failed: %08x\n", debugstr_w(str), hres); > + IXMLDOMDocument_Release(xmldoc); > + SysFreeString(str); > + return hres; > + } This is not how it works. loadXML() returns S_FALSE on load failure as well, so you have to test strictly for S_OK, or check VARIANT_BOOL argument. You can probably add a test when invalid xml stream is received to see how _get_responseXML() behaves, e.g. does it return S_FALSE and a valid IDispatch or does it fail and return NULL. Also I don't think it's a good idea to trace xml contents.

3 3

Re: riched20: Set pStream->written in ME_StreamOutFlush.
by Huw Davies Nov. 4, 2015

Nov. 4, 2015

On Thu, Oct 29, 2015 at 01:20:57PM +0800, Jactry Zeng wrote: > diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c > index 2c7386a..72a8db5 100644 > --- a/dlls/riched20/writer.c > +++ b/dlls/riched20/writer.c > @@ -63,6 +63,7 @@ ME_StreamOutFlush(ME_OutStream *pStream) > /* Don't resend partial chunks if nWritten < pStream->pos */ > } > pStream->pos = 0; > + pStream->written += nWritten; > return TRUE; > } While this is probably correct, it would be easy to add tests for this. We already have EM_STREAMOUT tests, so just add checks on their return values. Huw.

2 2

Re: dinput: Ensure X11 input events are forwarded to wineserver even without message loop.
by Marvin Nov. 4, 2015

Nov. 4, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17964 Your paranoid android. === wvistau64 (32 bit mouse) === mouse.c:124: Test failed: IDirectInputDevice_Acquire() failed: 80070005 mouse.c:126: Test failed: IDirectInputDevice_Acquire() should have failed: 80070005 mouse.c:144: Test failed: Acquire() failed: 80070005

1 0

Re: [PATCH] odbccp32: Implement SQLGetPrivateProfileStringW/SQLGetPrivateProfileString (resend)
by Nikolay Sivov Nov. 4, 2015

Nov. 4, 2015

On 26.10.2015 11:56, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/odbccp32/odbccp32.c | 182 ++++++++++++++++++++++++++++++++---- > dlls/odbccp32/tests/misc.c | 223 ++++++++++++++++++++++++++++++++++++++++++++- > include/odbcinst.h | 4 +- > 3 files changed, 389 insertions(+), 20 deletions(-) This looks mostly fine. Let me suggest some cleanups. > > -int WINAPI SQLGetPrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry, > - LPCWSTR lpszDefault, LPCWSTR RetBuffer, int cbRetBuffer, > - LPCWSTR lpszFilename) > +static HKEY get_privateprofile_sectionkey(LPCWSTR section, LPCWSTR filename) > { > + static const WCHAR odbcW[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\',0}; > + HKEY hkey, hkeyfilename, hkeysection; > + LONG ret; > + > + if (RegOpenKeyW(HKEY_CURRENT_USER, odbcW, &hkey)) > + return NULL; > + > + ret = RegOpenKeyW(hkey, filename, &hkeyfilename); > + RegCloseKey(hkey); > + if (ret) > + return NULL; > + > + ret = RegOpenKeyW(hkeyfilename, section, &hkeysection); > + RegCloseKey(hkeyfilename); > + if (ret) > + return NULL; These 2 lines are redundant, you can remove them, or turn return line to always return hkeysection. > + > + return ret ? NULL : hkeysection; > +} > + > + if (!buff_len) > + return 0; > + > + if(!defvalue) > + buff[0] = 0; Please use consistent formatting, 4 leading spaces, and space after 'if'. > + > + if (!section || !defvalue || !buff) > + return 0; > + > + if (buff) > + buff[0] = 0; > + > + sectionkey = get_privateprofile_sectionkey(section, filename); > + if (sectionkey) > + { > + DWORD type, size; > + > + if(entry) > + { > + size = buff_len * sizeof(*buff); > + if (!RegGetValueW(sectionkey, NULL, entry, RRF_RT_REG_SZ, &type, buff, &size)) > + { > + usedefault = FALSE; > + ret = (size / sizeof(*buff)) - 1; > + } > + } > + else > + { > + WCHAR name[MAX_PATH]; > + DWORD index = 0; > + DWORD namelen; > + > + usedefault = FALSE; > + > + namelen = sizeof(name); > + while (RegEnumValueW(sectionkey, index, name, &namelen, NULL, NULL, NULL, NULL ) == ERROR_SUCCESS) > + { > + if ((ret + namelen+1) > buff_len) > + break; > + > + lstrcpyW(buff+ret, name); > + ret += namelen+1; > + namelen = sizeof(name); > + index++; > + } > + } What I don't understand is why temporary fixed size buffer is needed. This loop immediately copies to return buffer, it should be possible to enumerate directly to this buffer, and if return buffer is not large enough to hold all values it should be identical to this break from the loop you have. Is there a test for test by the way? For consistency it's better to turn RegEnumValueW to !RegEnumValueW, like RegGetValueW does, or the other way around, it depends on which style we use for the rest of dll already. Also not space at the end of parameter list. All of that applies to A-function too. > + > + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 256, "ODBC.INI"); > + ok(ret == 8, "SQLGetPrivateProfileString returned %d\n", ret); > + ok(!strcmp(buffer, "defaultX"), "incorrect string '%s'\n", buffer); > + > + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 4, "ODBC.INI"); > + ok(ret == 3, "SQLGetPrivateProfileString returned %d\n", ret); > + ok(!strcmp(buffer, "def"), "incorrect string '%s'\n", buffer); > + > + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 8, "ODBC.INI"); > + ok(ret == 7, "SQLGetPrivateProfileString returned %d\n", ret); > + ok(!strcmp(buffer, "default"), "incorrect string '%s'\n", buffer); Please replace all magic numbers with strlen/strlenW/sizeof. > + > + strcpy(buffer, "wine"); > + ret = SQLGetPrivateProfileString("wineodbc", NULL , "", buffer, 256, "abcd.ini"); > + ok(ret == 14, "SQLGetPrivateProfileString returned %d\n", ret); > + if(ret >= 14) > + { > + ok(!strcmp(buffer, "testing"), "incorrect string '%s'\n", buffer); > + ok(!strcmp(buffer+8, "value"), "incorrect string '%s'\n", buffer+8); > + } Why testing this separately? It looks easier to test whole buffer at once, with memcmp if some embedding nulls are expected. With all that fixed, I think it's good to go.

1 0

Re: riched20: Implement superscript/subscript shortcut key.
by Huw Davies Nov. 4, 2015

Nov. 4, 2015

On Thu, Oct 29, 2015 at 02:02:23PM +0800, Jactry Zeng wrote: > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index 98c7414..a54c0c7 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -2442,6 +2442,32 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) > return TRUE; > } > break; > + case VK_OEM_PLUS: > + if (ctrl_is_down) > + { > + CHARFORMAT2W fmt; > + > + ZeroMemory(&fmt, sizeof(fmt)); > + fmt.cbSize = sizeof(CHARFORMAT2W); > + SendMessageW(editor->hWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); > + if (shift_is_down) > + { > + if (fmt.dwEffects & CFE_SUBSCRIPT) > + fmt.dwEffects &= ~CFE_SUBSCRIPT; > + fmt.dwMask = CFM_SUPERSCRIPT; > + fmt.dwEffects ^= CFE_SUPERSCRIPT; > + } > + else > + { > + if (fmt.dwEffects & CFE_SUPERSCRIPT) > + fmt.dwEffects &= ~CFE_SUPERSCRIPT; > + fmt.dwMask = CFM_SUBSCRIPT; > + fmt.dwEffects ^= CFE_SUBSCRIPT; > + } > + SendMessageW(editor->hWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); > + return TRUE; > + } > + break; > case VK_ESCAPE: > if (editor->bDialogMode && editor->hwndParent) > PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); > Again, it shouldn't be too hard to add a test for this. We do similar tests by sending WM_KEYDOWN/UP messages to the control. Huw.

2 1

Re: [PATCH v3 2/7] msvcrt: Refactor pf_printf to take options as flags instead of as BOOL parameter
by Piotr Caban Nov. 3, 2015

Nov. 3, 2015

On 11/03/15 11:12, Martin Storsjo wrote: > From: Piotr Caban <piotr(a)codeweavers.com> I've screwed up sending improved version of the patch without correct "from" header. You're the author of the patch. Please resend it with correct author and without sign-off by me - I'll reply with a sign-off message. Thanks, Piotr

1 0

Re: [PATCH v3 6/7] ucrtbase: Handle the C99 'z' size_t specifier for integers
by Piotr Caban Nov. 3, 2015

Nov. 3, 2015

On 11/03/15 11:12, Martin Storsjo wrote: > + vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%zx %d", (size_t) 0x12345678123456, 1); Please avoid adding such long lines without a good reason. Thanks, Piotr

1 0

Re: [PATCH] configure: Fix compilation for systems without libpulse
by Bruno Jesus Nov. 3, 2015

Nov. 3, 2015

On Tue, Nov 3, 2015 at 9:00 PM, Andrew Eikum <aeikum(a)codeweavers.com> wrote: > Sorry about that, Francois. I think this will fix it. I took your > suggestion to use enable_winepulse_drv instead of PULSE_LIBS in the > later section. Hi, Andrew. I applied the patch and did a new configure && make, configure shows that I don't have Pulseaudio installed [1] but still I get the same problem when it hits winepulse.drv. Then I manually erased the Makefile inside winepulse.drv and did a second configure and make. Make recreated file still have -lpulse. [1] configure: libpulse 32-bit development files not found or too old, Pulse won't be supported. Am I missing something? I really don't understand this make stuff, sorry =/

3 3

Re: [PATCH 6/7] d3d11: Add support for mapping 3D textures. (resend)
by Henri Verbeet Nov. 3, 2015

Nov. 3, 2015

On 2 November 2015 at 17:12, Józef Kucia <jkucia(a)codeweavers.com> wrote: > - FIXME("Unhandled resource dimension %#x.\n", dimension); > + FIXME("Unhandled resource dimension %u.\n", dimension); I'd prefer to consistently use %#x for enum values. It doesn't make so much of a difference for regular elements here, but %#x is much more readable when you get invalid values like e.g. ~0u in there due to some bug.

1 0

Re: [v3 resend2] d3d9: call wined3d_device_copy_sub_resource_region instead of wined3d_device_update_surface in d3d9_device_UpdateSurface
by Stefan Dösinger Nov. 3, 2015

Nov. 3, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I spotted a few style issues. Not sure if that's what Henri didn't like about it, or if he disagrees with the concept of the patch. Am 2015-11-03 um 08:34 schrieb Riccardo Bortolato: > + if (!(sub_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx))) > + { > + WARN("no subresource found for texture %p sub_resource_idx %u\n", src->wined3d_texture, src->sub_resource_idx); We usually have a period at the end of wined3d trace messages. > + WARN("source %p must be SYSTEMMEM and dest %p must be DEFAULT, returning WINED3DERR_INVALIDCALL\n", > + src_surface, dst_surface); > + wined3d_mutex_unlock(); > + return D3DERR_INVALIDCALL; The trace message mentions the wrong return value (WINED3DERR... vs D3DERR...). > + hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, > + wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0, > + dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture), > + src->sub_resource_idx, &src_box); Indentation (8 spaces for the line continuations). Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWOKUmAAoJEN0/YqbEcdMwCaIP/A/V33gPqKBJtBJAXi8UnsEG dENusnecbrxauf6Sc6x5g7cYriBUEph5ndYa96y+lv8qKuOg9jVLeoUkfBHqpE8f V77p3cCnAJJ2XzbFJkqu8jY5GKvaAmoizezOyPRi/lgXa2xydH5yzW5NFu27Rbq8 KeG3kuBIBDzkJ1poSUvYWvSqUTGOeaUEYZBkDttqPegHvjPpYJg6MAzpr33c/F5P s5ttSwhRdPFQJU3iktZKElhuUX2SBZnBwcueR4xAN+/4bRCIAhy2tnPXbQgC8Tih dcQzVWCoQ+qK3nmYjDUrwvvWdEF78D+BOQzVtOOn4kHZwE1XQ7M1paV8en0uV0VS D8Jdx4shCQGkxZncBsfysbEPkqgApukCFJp34JfXWFxlpVbiK6m2Y3DzsdyhGxek Ky30AIY7FadUit5KWehcqDUj9Z8HOFdgcCe0KWqeFpeQn4G6t9gfJiiKYRV3m6TD OxwLT+HcD4lozPARMTq6IT7pV3hOG0xdKNuTKfgji9+8RWRNz5nGa/Ml4WzS49lV YHV06Nnb3ayw1CYTBoK2jwp5hBzAybdghSW7sKNJ6gLy3JFsZOKpKnr2yVxV1WD2 g8E5+tqwPDxgiriDOZrM5tPTc8+QLSaIm+Q59TKE3ScSvWVZArERVMtAk8/vd7BA nAXvxDoQsVBSa7z+zwRC =+ADb -----END PGP SIGNATURE-----

2 2

Re: [PATCH 1/8] Revert "wined3d: Track if a context's private hdc has had its pixel format set, so we don't need to check it."
by Henri Verbeet Nov. 3, 2015

Nov. 3, 2015

On 2 November 2015 at 21:37, Ken Thomases <ken(a)codeweavers.com> wrote: > This reverts commit f3aa4812382caa459b9b612f66998c6ea8257594. > --- I may have mentioned this the last time this series came up, but if you want me to consider signing off on this it wouldn't hurt to include some text on what the actual issue is, what configurations are affected, why a year and a half isn't enough time to fix it, etc.

3 3

Broken PulseAudio configure check
by Francois Gouget Nov. 3, 2015

Nov. 3, 2015

The PulseAudio configure check is broken: WINE_PACKAGE_FLAGS(PULSE,[libpulse],,,, [AC_CHECK_HEADERS(pulse/pulseaudio.h, [AC_CHECK_LIB(pulse,pa_stream_is_corked,[:],,[$PULSE_LIBS])])]) [...] test -n "$PULSE_LIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no} WINE_PACKAGE_FLAGS() sets PULSE_LIBS but PULSE_LIBS is not unset even if AC_CHECK_LIB() fails. As a result compilation of winepulse.drv is enabled even if libpulse.so is missing. I don't have the 32-bit libpulse.so library so this resulted in a compilation error here: ../../tools/winegcc/winegcc -o winepulse.drv.so -B../../tools/winebuild -m32 -fasynchronous-unwind-tables -shared winepulse.drv.spec \ mmdevdrv.o -ldxguid -luuid -lwinmm -luser32 -ladvapi32 -lole32 -lwine \ ../../libs/port/libwine_port.a -lpulse -lpthread /usr/bin/ld: cannot find -lpulse collect2: error: ld returned 1 exit status winegcc: gcc failed Makefile:185: recipe for target 'winepulse.drv.so' failed I also find it strange that all these audio modules are enabled/disabled at the end of the configure.ac file instead of where support is checked. Also the 'Check for any sound system' should probably not look into the internals of audio systems (i.e. check for PULSE_LIBS) and instead only rely on the enable_xxx_drv variables which should have been set by then. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Avoid the Gates of Hell - use Linux.

1 0

Re: [2/2] msi: Make sure to reset the 'in_quotes' state in all cases.
by Marvin Nov. 3, 2015

Nov. 3, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17929 Your paranoid android. === w7u (32 bit install) === The test timed out

1 0

Re: [PATCH v2 4/7] ucrtbase: Implement the new printf corner case behaviour
by Piotr Caban Nov. 3, 2015

Nov. 3, 2015

On 11/02/15 22:26, Martin Storsjo wrote: > - if (options & ~UCRTBASE_PRINTF_TERMINATION_MASK) > - FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); Shouldn't this be changed to: if(options & ~UCRTBASE_PRINTF_MASK) FIXME("...); instead of being removed? Thanks, Piotr

2 2

Re: [PATCH v2 5/7] msvcrt: Interpret 'I' as size_t size specifier for integer conversions
by Piotr Caban Nov. 3, 2015

Nov. 3, 2015

On 11/02/15 22:26, Martin Storsjo wrote: > + format = "%Ix %d"; > + r = sprintf(buffer,format,0x123456,1); > + ok(!strcmp(buffer,"123456 1"),"Pointer formatted incorrectly\n"); > + ok( r==8, "return count wrong\n"); Please change the test failure message (I would prefer something like ok(!strcmp(...), "buffer = %s\n", buffer)). Thanks, Piotr

2 1

Re: [PATCH v2 4/7] ucrtbase: Implement the new printf corner case behaviour
by Piotr Caban Nov. 3, 2015

Nov. 3, 2015

On 11/02/15 22:26, Martin Storsjo wrote: > + test_legacy_wide(); > + test_legacy_msvcrt(); > + test_legacy_three_digit_exp(); I also think it would be nicer if this tests are called e.g. test_printf_legacy_wide. Thanks, Piotr

2 1

Re: [6/6] oleaut32/tests: Add a bunch of new tests for typelib generation.
by Marvin Nov. 3, 2015

Nov. 3, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17920 Your paranoid android. === wxppro (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 77C47740 === w2003std (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 77BD85F0 === wvistau64 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 77189BBD === w2008s64 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 74FB9BBD === w7u (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 77598B21 === w7pro64 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 769A8B21 === w8 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 76B0B4BF === w864 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 7748B4BF === w1064 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 75688E90 === wvistau64 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 000007FEFE804E90 === w2008s64 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 000007FEFF134E90 === w7pro64 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 000007FEFDB35960 === w864 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 00007FFB7B0A11A0 === w1064 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 00007FF85AA7C510

1 0

Re: [4/6] widl: Attributes of the alias are supposed to replace attributes of a tag in the typelib. Resend.
by Marvin Nov. 3, 2015

Nov. 3, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=17919 Your paranoid android. === wxppro (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w2003std (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === wvistau64 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w2008s64 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w7u (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w7pro64 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w8 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w864 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w1064 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === wvistau64 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w2008s64 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w7pro64 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w864 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w1064 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b

1 0