June 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : opengl32: Move wglCreateContextAttribsARB to the WGL driver.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 3bcb8057a17fc3386e756706022510784291869d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bcb8057a17fc3386e7567060… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 15:07:44 2012 +0200 opengl32: Move wglCreateContextAttribsARB to the WGL driver. --- dlls/gdi32/opengl.c | 29 ----------------------------- dlls/opengl32/wgl.c | 27 ++++++++++++++++++++------- dlls/winex11.drv/opengl.c | 28 +++++++++++++++------------- include/wine/gdi_driver.h | 3 ++- 4 files changed, 37 insertions(+), 50 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index ba4106b..81a9824 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -82,26 +82,6 @@ HGLRC WINAPI wglCreateContext(HDC hdc) } /*********************************************************************** - * wglCreateContextAttribsARB - */ -static HGLRC WINAPI wglCreateContextAttribsARB(HDC hdc, HGLRC hShareContext, const int *attributeList) -{ - HGLRC ret = 0; - DC * dc = get_dc_ptr( hdc ); - - TRACE("(%p)\n",hdc); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pwglCreateContextAttribsARB ); - update_dc( dc ); - ret = physdev->funcs->pwglCreateContextAttribsARB( physdev, hShareContext, attributeList ); - release_dc_ptr( dc ); - } - return ret; -} - -/*********************************************************************** * Internal wglGetProcAddress for retrieving WGL extensions */ PROC WINAPI wglGetProcAddress(LPCSTR func) @@ -122,15 +102,6 @@ PROC WINAPI wglGetProcAddress(LPCSTR func) ret = physdev->funcs->pwglGetProcAddress(func); release_dc_ptr( dc ); } - - /* At the moment we implement one WGL extension which requires a HDC. When we - * are looking up this call and when the Extension is available (that is the case - * when a non-NULL value is returned by wglGetProcAddress), we return the address - * of a wrapper function which will handle the HDC->PhysDev conversion. - */ - if(ret && strcmp(func, "wglCreateContextAttribsARB") == 0) - return (PROC)wglCreateContextAttribsARB; - return ret; } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9761bba..ab26f4a 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -133,6 +133,14 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) } /*********************************************************************** + * wglCreateContextAttribsARB (wrapper for the extension function returned by the driver) + */ +static HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attribs ) +{ + return wgl_driver->p_wglCreateContextAttribsARB( hdc, share, attribs ); +} + +/*********************************************************************** * wglMakeContextCurrentARB (wrapper for the extension function returned by the driver) */ static BOOL WINAPI wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC hglrc ) @@ -464,6 +472,12 @@ static BOOL is_extension_supported(const char* extension) return FALSE; } +static const OpenGL_extension wgl_extensions[] = +{ + { "wglCreateContextAttribsARB", "WGL_ARB_create_context", wglCreateContextAttribsARB }, + { "wglMakeContextCurrentARB", "WGL_ARB_make_current_read", wglMakeContextCurrentARB }, +}; + /*********************************************************************** * wglGetProcAddress (OPENGL32.@) */ @@ -499,13 +513,12 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { local_func = wine_wgl.p_wglGetProcAddress( lpszProc ); if (local_func == (void *)1) /* special function that needs a wrapper */ { - if (!strcmp( lpszProc, "wglMakeContextCurrentARB" )) - local_func = wglMakeContextCurrentARB; - else - { - FIXME( "wrapper missing for %s\n", lpszProc ); - local_func = NULL; - } + ext_ret = bsearch( &ext, wgl_extensions, sizeof(wgl_extensions)/sizeof(wgl_extensions[0]), + sizeof(OpenGL_extension), compar ); + if (ext_ret) return ext_ret->func; + + FIXME( "wrapper missing for %s\n", lpszProc ); + return NULL; } return local_func; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index f99e98c..90d4cd6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1913,35 +1913,36 @@ static void WINAPI X11DRV_wglFlush(void) } } -/** - * glxdrv_wglCreateContextAttribsARB - * - * WGL_ARB_create_context: wglCreateContextAttribsARB +/*********************************************************************** + * glxdrv_wglCreateContextAttribsARB */ -static HGLRC glxdrv_wglCreateContextAttribsARB(PHYSDEV dev, HGLRC hShareContext, const int* attribList) +static HGLRC glxdrv_wglCreateContextAttribsARB( HDC hdc, HGLRC hShareContext, const int* attribList ) { - struct glx_physdev *physdev = get_glxdrv_dev( dev ); + struct x11drv_escape_get_drawable escape; Wine_GLContext *ret; WineGLPixelFormat *fmt; int fmt_count = 0; - TRACE("(%p %p %p)\n", dev->hdc, hShareContext, attribList); + TRACE("(%p %p %p)\n", hdc, hShareContext, attribList); - if (!has_opengl()) return 0; + escape.code = X11DRV_GET_DRAWABLE; + if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape.code), (LPCSTR)&escape.code, + sizeof(escape), (LPSTR)&escape )) + return 0; - fmt = ConvertPixelFormatWGLtoGLX(gdi_display, physdev->pixel_format, TRUE /* Offscreen */, &fmt_count); + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, escape.pixel_format, TRUE /* Offscreen */, &fmt_count); /* wglCreateContextAttribsARB supports ALL pixel formats, so also offscreen ones. * If this fails something is very wrong on the system. */ if(!fmt) { - ERR("Cannot get FB Config for iPixelFormat %d, expect problems!\n", physdev->pixel_format); + ERR("Cannot get FB Config for iPixelFormat %d, expect problems!\n", escape.pixel_format); SetLastError(ERROR_INVALID_PIXEL_FORMAT); return NULL; } if (!(ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) return 0; - ret->hdc = dev->hdc; + ret->hdc = hdc; ret->fmt = fmt; ret->vis = NULL; /* glXCreateContextAttribsARB requires a fbconfig instead of a visual */ ret->gl3_context = TRUE; @@ -3076,7 +3077,7 @@ static const WineGLExtension WGL_ARB_create_context = { "WGL_ARB_create_context", { - { "wglCreateContextAttribsARB", (void *)1 /* not called directly */ }, + { "wglCreateContextAttribsARB", (void *)1 /* called through the glxdrv_wgl_funcs driver */ }, } }; @@ -3591,7 +3592,7 @@ static const struct gdi_dc_funcs glxdrv_funcs = NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ glxdrv_wglCreateContext, /* pwglCreateContext */ - glxdrv_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */ + NULL, /* pwglCreateContextAttribsARB */ glxdrv_wglGetProcAddress, /* pwglGetProcAddress */ glxdrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ GDI_PRIORITY_GRAPHICS_DRV + 20 /* priority */ @@ -3600,6 +3601,7 @@ static const struct gdi_dc_funcs glxdrv_funcs = static const struct wgl_funcs glxdrv_wgl_funcs = { glxdrv_wglCopyContext, /* p_wglCopyContext */ + glxdrv_wglCreateContextAttribsARB, /* p_wglCreateContextAttribsARB */ glxdrv_wglDeleteContext, /* p_wglDeleteContext */ glxdrv_wglGetCurrentDC, /* p_wglGetCurrentDC */ glxdrv_wglMakeContextCurrentARB, /* p_wglMakeContextCurrentARB */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 4f4ad94..b3d01d4 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -203,7 +203,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 34 +#define WINE_GDI_DRIVER_VERSION 35 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -234,6 +234,7 @@ static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct g struct wgl_funcs { BOOL (*p_wglCopyContext)(HGLRC,HGLRC,UINT); + HGLRC (*p_wglCreateContextAttribsARB)(HDC,HGLRC,const int*); BOOL (*p_wglDeleteContext)(HGLRC); HDC (*p_wglGetCurrentDC)(void); BOOL (*p_wglMakeContextCurrentARB)(HDC,HDC,HGLRC);

1 0

Alexandre Julliard : opengl32: Move wglCreateContext to the WGL driver.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: bbdf77a3118df6af777af73fd3fa1efe592d315a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbdf77a3118df6af777af73fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 15:47:31 2012 +0200 opengl32: Move wglCreateContext to the WGL driver. --- dlls/gdi32/gdi32.spec | 1 - dlls/gdi32/opengl.c | 20 -------------------- dlls/opengl32/wgl.c | 4 +--- dlls/winex11.drv/opengl.c | 26 ++++++++++++++------------ include/wine/gdi_driver.h | 3 ++- 5 files changed, 17 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5954892..9dfa4dd 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -499,7 +499,6 @@ ################################################################ # Wine extensions: OpenGL support # -@ stdcall -private wglCreateContext(long) @ stdcall -private wglGetProcAddress(str) ################################################################ diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 81a9824..f8e5de7 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -62,26 +62,6 @@ static DC* OPENGL_GetDefaultDC(void) } /*********************************************************************** - * wglCreateContext (OPENGL32.@) - */ -HGLRC WINAPI wglCreateContext(HDC hdc) -{ - HGLRC ret = 0; - DC * dc = get_dc_ptr( hdc ); - - TRACE("(%p)\n",hdc); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pwglCreateContext ); - update_dc( dc ); - ret = physdev->funcs->pwglCreateContext( physdev ); - release_dc_ptr( dc ); - } - return ret; -} - -/*********************************************************************** * Internal wglGetProcAddress for retrieving WGL extensions */ PROC WINAPI wglGetProcAddress(LPCSTR func) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index ab26f4a..c604774 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -49,7 +49,6 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl); static struct { PROC (WINAPI *p_wglGetProcAddress)(LPCSTR lpszProc); - HGLRC (WINAPI *p_wglCreateContext)(HDC hdc); INT (WINAPI *p_GetPixelFormat)(HDC hdc); /* internal WGL functions */ @@ -174,7 +173,7 @@ HDC WINAPI wglGetCurrentDC(void) */ HGLRC WINAPI wglCreateContext(HDC hdc) { - return wine_wgl.p_wglCreateContext(hdc); + return wgl_driver->p_wglCreateContext(hdc); } /*********************************************************************** @@ -1130,7 +1129,6 @@ static BOOL process_attach(void) } wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress"); - wine_wgl.p_wglCreateContext = (void *)GetProcAddress(mod_gdi32, "wglCreateContext"); wine_wgl.p_GetPixelFormat = (void *)GetProcAddress(mod_gdi32, "GetPixelFormat"); /* internal WGL functions */ diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 90d4cd6..df625d3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1413,36 +1413,37 @@ static BOOL glxdrv_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) return TRUE; } -/** - * X11DRV_wglCreateContext - * - * For OpenGL32 wglCreateContext. +/*********************************************************************** + * glxdrv_wglCreateContext */ -static HGLRC glxdrv_wglCreateContext(PHYSDEV dev) +static HGLRC glxdrv_wglCreateContext( HDC hdc ) { - struct glx_physdev *physdev = get_glxdrv_dev( dev ); + struct x11drv_escape_get_drawable escape; Wine_GLContext *ret; WineGLPixelFormat *fmt; int fmt_count = 0; - TRACE("(%p)->(PF:%d)\n", dev->hdc, physdev->pixel_format); + TRACE( "(%p)\n", hdc ); - if (!has_opengl()) return 0; + escape.code = X11DRV_GET_DRAWABLE; + if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape.code), (LPCSTR)&escape.code, + sizeof(escape), (LPSTR)&escape )) + return 0; - fmt = ConvertPixelFormatWGLtoGLX(gdi_display, physdev->pixel_format, TRUE /* Offscreen */, &fmt_count); + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, escape.pixel_format, TRUE /* Offscreen */, &fmt_count); /* We can render using the iPixelFormat (1) of Wine's Main visual AND using some offscreen formats. * Note that standard WGL-calls don't recognize offscreen-only formats. For that reason pbuffers * use a sort of 'proxy' HDC (wglGetPbufferDCARB). * If this fails something is very wrong on the system. */ if(!fmt) { - ERR("Cannot get FB Config for iPixelFormat %d, expect problems!\n", physdev->pixel_format); + ERR("Cannot get FB Config for iPixelFormat %d, expect problems!\n", escape.pixel_format); SetLastError(ERROR_INVALID_PIXEL_FORMAT); return NULL; } if (!(ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) return 0; - ret->hdc = dev->hdc; + ret->hdc = hdc; ret->fmt = fmt; ret->has_been_current = FALSE; ret->sharing = FALSE; @@ -3591,7 +3592,7 @@ static const struct gdi_dc_funcs glxdrv_funcs = glxdrv_SwapBuffers, /* pSwapBuffers */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ - glxdrv_wglCreateContext, /* pwglCreateContext */ + NULL, /* pwglCreateContext */ NULL, /* pwglCreateContextAttribsARB */ glxdrv_wglGetProcAddress, /* pwglGetProcAddress */ glxdrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ @@ -3601,6 +3602,7 @@ static const struct gdi_dc_funcs glxdrv_funcs = static const struct wgl_funcs glxdrv_wgl_funcs = { glxdrv_wglCopyContext, /* p_wglCopyContext */ + glxdrv_wglCreateContext, /* p_wglCreateContext */ glxdrv_wglCreateContextAttribsARB, /* p_wglCreateContextAttribsARB */ glxdrv_wglDeleteContext, /* p_wglDeleteContext */ glxdrv_wglGetCurrentDC, /* p_wglGetCurrentDC */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index b3d01d4..796d4fa 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -203,7 +203,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 35 +#define WINE_GDI_DRIVER_VERSION 36 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -234,6 +234,7 @@ static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct g struct wgl_funcs { BOOL (*p_wglCopyContext)(HGLRC,HGLRC,UINT); + HGLRC (*p_wglCreateContext)(HDC); HGLRC (*p_wglCreateContextAttribsARB)(HDC,HGLRC,const int*); BOOL (*p_wglDeleteContext)(HGLRC); HDC (*p_wglGetCurrentDC)(void);

1 0

Alexandre Julliard : opengl32: Move GetPixelFormat to the WGL driver.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 8a13afedd6970ecccc64f105d7a459bc4292604c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a13afedd6970ecccc64f105d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 15:51:44 2012 +0200 opengl32: Move GetPixelFormat to the WGL driver. --- dlls/gdi32/opengl.c | 15 +++++++++++ dlls/gdi32/painting.c | 29 --------------------- dlls/opengl32/wgl.c | 4 +-- dlls/winex11.drv/opengl.c | 61 +++++++++++++++++++++++--------------------- include/wine/gdi_driver.h | 3 +- 5 files changed, 50 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index f8e5de7..95db11d 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -42,6 +42,7 @@ static const WCHAR opengl32W[] = {'o','p','e','n','g','l','3','2','.','d','l','l static HMODULE opengl32; static INT (WINAPI *wglChoosePixelFormat)(HDC,const PIXELFORMATDESCRIPTOR *); static INT (WINAPI *wglDescribePixelFormat)(HDC,INT,UINT,PIXELFORMATDESCRIPTOR*); +static INT (WINAPI *wglGetPixelFormat)(HDC); static BOOL (WINAPI *wglSetPixelFormat)(HDC,INT,const PIXELFORMATDESCRIPTOR*); static BOOL (WINAPI *wglSwapBuffers)(HDC); @@ -131,6 +132,20 @@ INT WINAPI DescribePixelFormat( HDC hdc, INT fmt, UINT size, PIXELFORMATDESCRIPT } /****************************************************************************** + * GetPixelFormat (GDI32.@) + */ +INT WINAPI GetPixelFormat( HDC hdc ) +{ + if (!wglGetPixelFormat) + { + if (!opengl32) opengl32 = LoadLibraryW( opengl32W ); + if (!(wglGetPixelFormat = (void *)GetProcAddress( opengl32, "wglGetPixelFormat" ))) + return 0; + } + return wglGetPixelFormat( hdc ); +} + +/****************************************************************************** * SetPixelFormat (GDI32.@) */ BOOL WINAPI SetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 571a96b..822c86a 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -509,35 +509,6 @@ BOOL WINAPI GdiSetPixelFormat( HDC hdc, INT iPixelFormat, const PIXELFORMATDESCR /****************************************************************************** - * GetPixelFormat [GDI32.@] - * Gets index of pixel format of DC - * - * PARAMETERS - * hdc [I] Device context whose pixel format index is sought - * - * RETURNS - * Success: Currently selected pixel format - * Failure: 0 - */ -INT WINAPI GetPixelFormat( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - - TRACE("(%p)\n",hdc); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetPixelFormat ); - update_dc( dc ); - ret = physdev->funcs->pGetPixelFormat( physdev ); - release_dc_ptr( dc ); - } - return ret; -} - - -/****************************************************************************** * GdiDescribePixelFormat [GDI32.@] * * Probably not the correct semantics, it's supposed to be an internal backend for DescribePixelFormat. diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index c604774..0a19506 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -49,7 +49,6 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl); static struct { PROC (WINAPI *p_wglGetProcAddress)(LPCSTR lpszProc); - INT (WINAPI *p_GetPixelFormat)(HDC hdc); /* internal WGL functions */ void (WINAPI *p_wglFinish)(void); @@ -361,7 +360,7 @@ INT WINAPI wglDescribePixelFormat(HDC hdc, INT iPixelFormat, UINT nBytes, */ INT WINAPI wglGetPixelFormat(HDC hdc) { - return wine_wgl.p_GetPixelFormat(hdc); + return wgl_driver->p_GetPixelFormat( hdc ); } /*********************************************************************** @@ -1129,7 +1128,6 @@ static BOOL process_attach(void) } wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress"); - wine_wgl.p_GetPixelFormat = (void *)GetProcAddress(mod_gdi32, "GetPixelFormat"); /* internal WGL functions */ wine_wgl.p_wglFinish = (void *)wine_wgl.p_wglGetProcAddress("wglFinish"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index df625d3..5f7c3d7 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1281,41 +1281,43 @@ static int glxdrv_DescribePixelFormat(PHYSDEV dev, int iPixelFormat, return ret; } -/** - * glxdrv_GetPixelFormat - * - * Get the pixel-format id used by this DC +/*********************************************************************** + * glxdrv_GetPixelFormat */ -static int glxdrv_GetPixelFormat(PHYSDEV dev) +static int glxdrv_GetPixelFormat( HDC hdc ) { - struct glx_physdev *physdev = get_glxdrv_dev( dev ); - WineGLPixelFormat *fmt; - int tmp; + struct x11drv_escape_get_drawable escape; + WineGLPixelFormat *fmt; + int tmp; - if (!physdev->pixel_format) return 0; /* not set yet */ + TRACE( "(%p)\n", hdc ); - fmt = ConvertPixelFormatWGLtoGLX(gdi_display, physdev->pixel_format, TRUE, &tmp); - if(!fmt) - { - ERR("Unable to find a WineGLPixelFormat for iPixelFormat=%d\n", physdev->pixel_format); - return 0; - } - else if(fmt->offscreenOnly) - { - /* Offscreen formats can't be used with traditional WGL calls. - * As has been verified on Windows GetPixelFormat doesn't fail but returns iPixelFormat=1. */ - TRACE("Returning iPixelFormat=1 for offscreen format: %d\n", fmt->iPixelFormat); - return 1; - } + escape.code = X11DRV_GET_DRAWABLE; + if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape.code), (LPCSTR)&escape.code, + sizeof(escape), (LPSTR)&escape )) + return 0; - TRACE("(%p): returns %d\n", dev->hdc, physdev->pixel_format); - return physdev->pixel_format; + if (!escape.pixel_format) return 0; /* not set yet */ + + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, escape.pixel_format, TRUE, &tmp); + if (!fmt) + { + ERR("Unable to find a WineGLPixelFormat for iPixelFormat=%d\n", escape.pixel_format); + return 0; + } + if (fmt->offscreenOnly) + { + /* Offscreen formats can't be used with traditional WGL calls. + * As has been verified on Windows GetPixelFormat doesn't fail but returns iPixelFormat=1. */ + TRACE("Returning iPixelFormat=1 for offscreen format: %d\n", fmt->iPixelFormat); + return 1; + } + TRACE("(%p): returns %d\n", hdc, escape.pixel_format); + return escape.pixel_format; } -/** - * glxdrv_SetPixelFormat - * - * Set the pixel-format id used by this DC +/*********************************************************************** + * glxdrv_SetPixelFormat */ static BOOL glxdrv_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) { @@ -3513,7 +3515,7 @@ static const struct gdi_dc_funcs glxdrv_funcs = NULL, /* pGetNearestColor */ NULL, /* pGetOutlineTextMetrics */ NULL, /* pGetPixel */ - glxdrv_GetPixelFormat, /* pGetPixelFormat */ + NULL, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetTextCharsetInfo */ NULL, /* pGetTextExtentExPoint */ @@ -3601,6 +3603,7 @@ static const struct gdi_dc_funcs glxdrv_funcs = static const struct wgl_funcs glxdrv_wgl_funcs = { + glxdrv_GetPixelFormat, /* p_GetPixelFormat */ glxdrv_wglCopyContext, /* p_wglCopyContext */ glxdrv_wglCreateContext, /* p_wglCreateContext */ glxdrv_wglCreateContextAttribsARB, /* p_wglCreateContextAttribsARB */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 796d4fa..4f8d0f1 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -203,7 +203,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 36 +#define WINE_GDI_DRIVER_VERSION 37 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -233,6 +233,7 @@ static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct g struct wgl_funcs { + INT (*p_GetPixelFormat)(HDC); BOOL (*p_wglCopyContext)(HGLRC,HGLRC,UINT); HGLRC (*p_wglCreateContext)(HDC); HGLRC (*p_wglCreateContextAttribsARB)(HDC,HGLRC,const int*);

1 0

Alexandre Julliard : opengl32: Move wglGetProcAddress to the WGL driver.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: edfc7f0de0ac5eb8b2051bccfb567da981cf4957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edfc7f0de0ac5eb8b2051bccf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 16:14:55 2012 +0200 opengl32: Move wglGetProcAddress to the WGL driver. --- dlls/gdi32/gdi32.spec | 5 ----- dlls/gdi32/opengl.c | 40 ---------------------------------------- dlls/opengl32/wgl.c | 25 ++++++------------------- dlls/wined3d/directx.c | 20 +++++++++----------- dlls/wined3d/wined3d_gl.h | 2 +- dlls/winex11.drv/opengl.c | 11 ++++------- include/wine/gdi_driver.h | 3 ++- 7 files changed, 22 insertions(+), 84 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 9dfa4dd..1e30485 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -497,11 +497,6 @@ @ stub pstackConnect ################################################################ -# Wine extensions: OpenGL support -# -@ stdcall -private wglGetProcAddress(str) - -################################################################ # Wine extensions: Win16 functions that are needed by other dlls # @ stdcall GetDCHook(long ptr) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 95db11d..1db261e 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -46,46 +46,6 @@ static INT (WINAPI *wglGetPixelFormat)(HDC); static BOOL (WINAPI *wglSetPixelFormat)(HDC,INT,const PIXELFORMATDESCRIPTOR*); static BOOL (WINAPI *wglSwapBuffers)(HDC); -static HDC default_hdc = 0; - -/* We route all wgl functions from opengl32.dll through gdi32.dll to - * the display driver. Various wgl calls have a hDC as one of their parameters. - * Using get_dc_ptr we get access to the functions exported by the driver. - * Some functions don't receive a hDC. This function creates a global hdc and - * if there's already a global hdc, it returns it. - */ -static DC* OPENGL_GetDefaultDC(void) -{ - if(!default_hdc) - default_hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); - - return get_dc_ptr(default_hdc); -} - -/*********************************************************************** - * Internal wglGetProcAddress for retrieving WGL extensions - */ -PROC WINAPI wglGetProcAddress(LPCSTR func) -{ - PROC ret = NULL; - DC *dc; - - if(!func) - return NULL; - - TRACE("func: '%s'\n", func); - - /* Retrieve the global hDC to get access to the driver. */ - dc = OPENGL_GetDefaultDC(); - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pwglGetProcAddress ); - ret = physdev->funcs->pwglGetProcAddress(func); - release_dc_ptr( dc ); - } - return ret; -} - /*********************************************************************** * __wine_get_wgl_driver (GDI32.@) */ diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 0a19506..4d5510f 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -48,8 +48,6 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl); static struct { - PROC (WINAPI *p_wglGetProcAddress)(LPCSTR lpszProc); - /* internal WGL functions */ void (WINAPI *p_wglFinish)(void); void (WINAPI *p_wglFlush)(void); @@ -508,7 +506,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { /* If the function name starts with a 'w', it is a WGL extension */ if(lpszProc[0] == 'w') { - local_func = wine_wgl.p_wglGetProcAddress( lpszProc ); + local_func = wgl_driver->p_wglGetProcAddress( lpszProc ); if (local_func == (void *)1) /* special function that needs a wrapper */ { ext_ret = bsearch( &ext, wgl_extensions, sizeof(wgl_extensions)/sizeof(wgl_extensions[0]), @@ -531,7 +529,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { WARN("Extension '%s' required by function '%s' not supported!\n", ext_ret->extension, lpszProc); } - local_func = wine_wgl.p_wglGetProcAddress(ext_ret->name); + local_func = wgl_driver->p_wglGetProcAddress(ext_ret->name); /* After that, look at the extensions defined in the Linux OpenGL library */ if (local_func == NULL) { @@ -1113,27 +1111,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH wglSwapBuffers( HDC hdc ) creating a rendering context.... */ static BOOL process_attach(void) { - HMODULE mod_gdi32; HDC hdc = GetDC( 0 ); wgl_driver = __wine_get_wgl_driver( hdc, WINE_GDI_DRIVER_VERSION ); ReleaseDC( 0, hdc ); - mod_gdi32 = GetModuleHandleA( "gdi32.dll" ); - - if (!mod_gdi32) - { - ERR("GDI32 not loaded. Cannot create default context.\n"); - return FALSE; - } - - wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress"); - /* internal WGL functions */ - wine_wgl.p_wglFinish = (void *)wine_wgl.p_wglGetProcAddress("wglFinish"); - wine_wgl.p_wglFlush = (void *)wine_wgl.p_wglGetProcAddress("wglFlush"); - wine_wgl.p_wglGetCurrentContext = (void *)wine_wgl.p_wglGetProcAddress("wglGetCurrentContext"); - wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); + wine_wgl.p_wglFinish = (void *)wgl_driver->p_wglGetProcAddress("wglFinish"); + wine_wgl.p_wglFlush = (void *)wgl_driver->p_wglGetProcAddress("wglFlush"); + wine_wgl.p_wglGetCurrentContext = (void *)wgl_driver->p_wglGetProcAddress("wglGetCurrentContext"); + wine_wgl.p_wglGetIntegerv = (void *)wgl_driver->p_wglGetProcAddress("wglGetIntegerv"); return TRUE; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f576b33..1cce96b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -27,6 +27,9 @@ #include <stdio.h> #include "wined3d_private.h" +#ifndef USE_WIN32_OPENGL +#include "wine/gdi_driver.h" +#endif WINE_DEFAULT_DEBUG_CHANNEL(d3d); @@ -5386,15 +5389,15 @@ static BOOL InitAdapters(struct wined3d *wined3d) #define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, #pfn); #else /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 instead of opengl32 */ - pwglGetProcAddress = (void*)GetProcAddress(GetModuleHandleA("gdi32.dll"), "wglGetProcAddress"); + { + HDC hdc = GetDC( 0 ); + const struct wgl_funcs *wgl_driver = __wine_get_wgl_driver( hdc, WINE_GDI_DRIVER_VERSION ); + pwglGetProcAddress = wgl_driver->p_wglGetProcAddress; + ReleaseDC( 0, hdc ); + } #define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); #endif - if(!pwglGetProcAddress) { - ERR("Unable to load wglGetProcAddress!\n"); - goto nogl_adapter; - } - /* Load WGL core functions from opengl32.dll */ #define USE_WGL_FUNC(pfn) p##pfn = (void*)GetProcAddress(mod_gl, #pfn); WGL_FUNCS_GEN; @@ -5407,13 +5410,8 @@ static BOOL InitAdapters(struct wined3d *wined3d) /* Load glFinish and glFlush from opengl32.dll even if we're not using WIN32 opengl * otherwise because we have to use winex11.drv's override */ -#ifdef USE_WIN32_OPENGL wglFinish = (void*)GetProcAddress(mod_gl, "glFinish"); wglFlush = (void*)GetProcAddress(mod_gl, "glFlush"); -#else - wglFinish = (void*)pwglGetProcAddress("wglFinish"); - wglFlush = (void*)pwglGetProcAddress("wglFlush"); -#endif glEnableWINE = glEnable; glDisableWINE = glDisable; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 51281e4..b8e2195 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1369,7 +1369,7 @@ HGLRC (WINAPI *pwglCreateContext)(HDC) DECLSPEC_HIDDEN; BOOL (WINAPI *pwglDeleteContext)(HGLRC) DECLSPEC_HIDDEN; HGLRC (WINAPI *pwglGetCurrentContext)(void) DECLSPEC_HIDDEN; HDC (WINAPI *pwglGetCurrentDC)(void) DECLSPEC_HIDDEN; -PROC (WINAPI *pwglGetProcAddress)(LPCSTR) DECLSPEC_HIDDEN; +PROC (WINE_GLAPI *pwglGetProcAddress)(LPCSTR) DECLSPEC_HIDDEN; BOOL (WINAPI *pwglMakeCurrent)(HDC, HGLRC) DECLSPEC_HIDDEN; BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5f7c3d7..10cd5ef 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1521,10 +1521,8 @@ static HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void) return ret; } -/** - * glxdrv_wglGetProcAddress - * - * For OpenGL32 wglGetProcAddress. +/*********************************************************************** + * glxdrv_wglGetProcAddress */ static PROC glxdrv_wglGetProcAddress(LPCSTR lpszProc) { @@ -1535,8 +1533,6 @@ static PROC glxdrv_wglGetProcAddress(LPCSTR lpszProc) if (padding < 0) padding = 0; - if (!has_opengl()) return NULL; - /* Check the table of WGL extensions to see if we need to return a WGL extension * or a function pointer to a native OpenGL function. */ if(strncmp(lpszProc, "wgl", 3) != 0) { @@ -3596,7 +3592,7 @@ static const struct gdi_dc_funcs glxdrv_funcs = NULL, /* pWidenPath */ NULL, /* pwglCreateContext */ NULL, /* pwglCreateContextAttribsARB */ - glxdrv_wglGetProcAddress, /* pwglGetProcAddress */ + NULL, /* pwglGetProcAddress */ glxdrv_wine_get_wgl_driver, /* wine_get_wgl_driver */ GDI_PRIORITY_GRAPHICS_DRV + 20 /* priority */ }; @@ -3609,6 +3605,7 @@ static const struct wgl_funcs glxdrv_wgl_funcs = glxdrv_wglCreateContextAttribsARB, /* p_wglCreateContextAttribsARB */ glxdrv_wglDeleteContext, /* p_wglDeleteContext */ glxdrv_wglGetCurrentDC, /* p_wglGetCurrentDC */ + glxdrv_wglGetProcAddress, /* p_wglGetProcAddress */ glxdrv_wglMakeContextCurrentARB, /* p_wglMakeContextCurrentARB */ glxdrv_wglMakeCurrent, /* p_wglMakeCurrent */ glxdrv_wglShareLists, /* p_wglShareLists */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 4f8d0f1..1476beb 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -203,7 +203,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 37 +#define WINE_GDI_DRIVER_VERSION 38 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -239,6 +239,7 @@ struct wgl_funcs HGLRC (*p_wglCreateContextAttribsARB)(HDC,HGLRC,const int*); BOOL (*p_wglDeleteContext)(HGLRC); HDC (*p_wglGetCurrentDC)(void); + PROC (*p_wglGetProcAddress)(LPCSTR); BOOL (*p_wglMakeContextCurrentARB)(HDC,HDC,HGLRC); BOOL (*p_wglMakeCurrent)(HDC,HGLRC); BOOL (*p_wglShareLists)(HGLRC,HGLRC);

1 0

Alexandre Julliard : opengl32: Move wglGetCurrentContext implementation to opengl32.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 855f225498e4ed2dc6cb1fb71aa5d9dcedd64744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855f225498e4ed2dc6cb1fb71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 18:51:54 2012 +0200 opengl32: Move wglGetCurrentContext implementation to opengl32. --- dlls/opengl32/wgl.c | 4 +--- dlls/winex11.drv/opengl.c | 9 --------- 2 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 4d5510f..203ee46 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -51,7 +51,6 @@ static struct /* internal WGL functions */ void (WINAPI *p_wglFinish)(void); void (WINAPI *p_wglFlush)(void); - HGLRC (WINAPI *p_wglGetCurrentContext)(void); void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); } wine_wgl; @@ -178,7 +177,7 @@ HGLRC WINAPI wglCreateContext(HDC hdc) */ HGLRC WINAPI wglGetCurrentContext(void) { - return wine_wgl.p_wglGetCurrentContext(); + return NtCurrentTeb()->glContext; } /*********************************************************************** @@ -1119,7 +1118,6 @@ static BOOL process_attach(void) /* internal WGL functions */ wine_wgl.p_wglFinish = (void *)wgl_driver->p_wglGetProcAddress("wglFinish"); wine_wgl.p_wglFlush = (void *)wgl_driver->p_wglGetProcAddress("wglFlush"); - wine_wgl.p_wglGetCurrentContext = (void *)wgl_driver->p_wglGetProcAddress("wglGetCurrentContext"); wine_wgl.p_wglGetIntegerv = (void *)wgl_driver->p_wglGetProcAddress("wglGetIntegerv"); return TRUE; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 10cd5ef..d67b5f6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1779,14 +1779,6 @@ static BOOL glxdrv_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) } /*********************************************************************** - * X11DRV_wglGetCurrentContext - */ -static HGLRC WINAPI X11DRV_wglGetCurrentContext(void) -{ - return NtCurrentTeb()->glContext; -} - -/*********************************************************************** * glxdrv_wglGetCurrentDC */ static HDC glxdrv_wglGetCurrentDC(void) @@ -3066,7 +3058,6 @@ static const WineGLExtension WGL_internal_functions = { { "wglFinish", X11DRV_wglFinish }, { "wglFlush", X11DRV_wglFlush }, - { "wglGetCurrentContext", X11DRV_wglGetCurrentContext }, { "wglGetIntegerv", X11DRV_wglGetIntegerv }, } };

1 0

Alexandre Julliard : gdi32: Remove the remaining OpenGL entry points from the DC driver.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 6a9dcd51a2151de98749e6f589a9d29c2c1127b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9dcd51a2151de98749e6f58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 16:38:33 2012 +0200 gdi32: Remove the remaining OpenGL entry points from the DC driver. --- dlls/gdi32/dibdrv/dc.c | 5 ----- dlls/gdi32/driver.c | 30 ------------------------------ dlls/gdi32/enhmfdrv/init.c | 5 ----- dlls/gdi32/freetype.c | 5 ----- dlls/gdi32/mfdrv/init.c | 5 ----- dlls/gdi32/path.c | 5 ----- dlls/wineps.drv/init.c | 5 ----- dlls/winex11.drv/init.c | 41 ----------------------------------------- dlls/winex11.drv/opengl.c | 5 ----- dlls/winex11.drv/xrender.c | 5 ----- include/wine/gdi_driver.h | 7 +------ 11 files changed, 1 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a9dcd51a2151de98749e…

1 0

Erich Hoover : hhctrl.ocx: Use document title for subtopics in the index.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 43ecfe036e792c8325461bddd7af37b3a796ac53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ecfe036e792c8325461bddd… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Jun 26 10:05:19 2012 -0600 hhctrl.ocx: Use document title for subtopics in the index. --- dlls/hhctrl.ocx/chm.c | 61 +++++++++++++++++++++++++++++++++++++++++++--- dlls/hhctrl.ocx/help.c | 2 + dlls/hhctrl.ocx/hhctrl.h | 1 + dlls/hhctrl.ocx/stream.h | 4 ++- 4 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index f051feb..cc92b89 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -20,6 +20,7 @@ */ #include "hhctrl.h" +#include "stream.h" #include "winreg.h" #include "shlwapi.h" @@ -27,10 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); -#define BLOCK_BITS 12 -#define BLOCK_SIZE (1 << BLOCK_BITS) -#define BLOCK_MASK (BLOCK_SIZE-1) - /* Reads a string from the #STRINGS section in the CHM file */ static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) { @@ -413,6 +410,62 @@ IStream *GetChmStream(CHMInfo *info, LPCWSTR parent_chm, ChmPath *chm_file) return stream; } +/* + * Retrieve a CHM document and parse the data from the <title> element to get the document's title. + */ +WCHAR *GetDocumentTitle(CHMInfo *info, LPCWSTR document) +{ + strbuf_t node, node_name, content; + WCHAR *document_title = NULL; + IStream *str = NULL; + IStorage *storage; + stream_t stream; + HRESULT hres; + + TRACE("%s\n", debugstr_w(document)); + + storage = info->pStorage; + if(!storage) { + WARN("Could not open storage to obtain the title for a document.\n"); + return NULL; + } + IStorage_AddRef(storage); + + hres = IStorage_OpenStream(storage, document, NULL, STGM_READ, 0, &str); + IStorage_Release(storage); + if(FAILED(hres)) + WARN("Could not open stream: %08x\n", hres); + + stream_init(&stream, str); + strbuf_init(&node); + strbuf_init(&content); + strbuf_init(&node_name); + + while(next_node(&stream, &node)) { + get_node_name(&node, &node_name); + + TRACE("%s\n", node.buf); + + if(!strcasecmp(node_name.buf, "title")) { + if(next_content(&stream, &content) && content.len > 1) + { + document_title = strdupnAtoW(&content.buf[1], content.len-1); + FIXME("magic: %s\n", debugstr_w(document_title)); + break; + } + } + + strbuf_zero(&node); + } + + strbuf_free(&node); + strbuf_free(&content); + strbuf_free(&node_name); + IStream_Release(str); + + return document_title; +} + /* Opens the CHM file for reading */ CHMInfo *OpenCHM(LPCWSTR szFile) { diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 3acb024..87ea94f 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -634,6 +634,8 @@ static LRESULT OnTopicChange(HHInfo *info, void *user_data) IndexSubItem *item = &iiter->items[i]; WCHAR *name = iiter->keyword; + if(!item->name) + item->name = GetDocumentTitle(info->pCHMInfo, item->local); if(item->name) name = item->name; memset(&lvi, 0, sizeof(lvi)); diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index eea7f7f..8959748 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -189,6 +189,7 @@ CHMInfo *CloseCHM(CHMInfo *pCHMInfo) DECLSPEC_HIDDEN; void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*) DECLSPEC_HIDDEN; LPWSTR FindContextAlias(CHMInfo*,DWORD) DECLSPEC_HIDDEN; +WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR) DECLSPEC_HIDDEN; HHInfo *CreateHelpViewer(LPCWSTR) DECLSPEC_HIDDEN; void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN; diff --git a/dlls/hhctrl.ocx/stream.h b/dlls/hhctrl.ocx/stream.h index 524109f..8d61ad5 100644 --- a/dlls/hhctrl.ocx/stream.h +++ b/dlls/hhctrl.ocx/stream.h @@ -19,7 +19,9 @@ #ifndef HHCTRL_STREAM_H #define HHCTRL_STREAM_H -#define BLOCK_SIZE 0x1000 +#define BLOCK_BITS 12 +#define BLOCK_SIZE (1 << BLOCK_BITS) +#define BLOCK_MASK (BLOCK_SIZE-1) typedef struct { char *buf;

1 0

Lucas Zawacki : joy.cpl: Make dialog the same size as the other cpl applets .
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 22e48becaad3502653edbdd8a28c79c5a3edec2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e48becaad3502653edbdd8a… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Wed Jun 27 00:08:11 2012 -0300 joy.cpl: Make dialog the same size as the other cpl applets. --- dlls/joy.cpl/joy.h | 2 +- dlls/joy.cpl/joy.rc | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/joy.cpl/joy.h b/dlls/joy.cpl/joy.h index c4a13b8..c98f535 100644 --- a/dlls/joy.cpl/joy.h +++ b/dlls/joy.cpl/joy.h @@ -82,7 +82,7 @@ struct JoystickData { #define TEST_BUTTON_X 15 #define TEST_BUTTON_Y 200 #define TEST_NEXT_BUTTON_X 45 -#define TEST_NEXT_BUTTON_Y 30 +#define TEST_NEXT_BUTTON_Y 40 #define TEST_BUTTON_SIZE_X 30 #define TEST_BUTTON_SIZE_Y 25 diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index 1e94990..0636868 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -28,32 +28,32 @@ BEGIN IDS_CPL_NAME "Game Controllers" END -IDD_LIST DIALOG 0, 0, 250, 200 +IDD_LIST DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Joysticks" FONT 8, "Ms Shell Dlg" { - PUSHBUTTON "&Disable", IDC_BUTTONDISABLE, 190, 20, 50, 15 - PUSHBUTTON "&Enable", IDC_BUTTONENABLE, 190, 95, 50, 15 + PUSHBUTTON "&Disable", IDC_BUTTONDISABLE, 200, 20, 50, 15 + PUSHBUTTON "&Enable", IDC_BUTTONENABLE, 200, 95, 50, 15 LTEXT "Connected", IDC_STATIC, 10, 10, 100, 10 - LISTBOX IDC_JOYSTICKLIST, 10, 20, 160, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY + LISTBOX IDC_JOYSTICKLIST, 10, 20, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY LTEXT "Disabled", IDC_STATIC, 10, 85, 100, 10 - LISTBOX IDC_DISABLEDLIST, 10, 95, 160, 50, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY + LISTBOX IDC_DISABLEDLIST, 10, 95, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY } -IDD_TEST DIALOG 0, 0, 250, 200 +IDD_TEST DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Test Joystick" FONT 8, "Ms Shell Dlg" { COMBOBOX IDC_TESTSELECTCOMBO, 5, 5, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS - GROUPBOX "Buttons", IDC_STATIC, 0, 110, 250, 90 + GROUPBOX "Buttons", IDC_STATIC, 0, 110, 250, 110 GROUPBOX "", IDC_TESTGROUPXY, 15, 30, 60, 60 GROUPBOX "", IDC_TESTGROUPRXRY, 92, 30, 60, 60 GROUPBOX "", IDC_TESTGROUPZRZ, 169, 30, 60, 60 } -IDD_FORCEFEEDBACK DIALOG 0, 0, 250, 200 +IDD_FORCEFEEDBACK DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Test Force Feedback" FONT 8, "Ms Shell Dlg"

1 0

Lucas Zawacki : joy.cpl: Added POV axis visualization.
by Alexandre Julliard 28 Jun '12

28 Jun '12

1 0

Nozomi Kodama : d3dx9_36: Implementation of D3DXSHDot.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: b56227cbf1e1686a8d3b7d57ca0d28b7a24fe699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56227cbf1e1686a8d3b7d57c… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Wed Jun 27 14:50:07 2012 +0800 d3dx9_36: Implementation of D3DXSHDot. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 14 ++++++++++++++ dlls/d3dx9_36/tests/math.c | 24 ++++++++++++++++++++++++ include/d3dx9math.h | 1 + 4 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 338585a..2ed971c5 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -273,7 +273,7 @@ @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) -@ stub D3DXSHDot(long ptr ptr) +@ stdcall D3DXSHDot(long ptr ptr) @ stub D3DXSHEvalConeLight(long ptr long long long long ptr ptr ptr) @ stub D3DXSHEvalDirection(ptr long ptr) @ stub D3DXSHEvalDirectionalLight(long ptr long long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 529665b..28958ae 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1981,6 +1981,20 @@ FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, const FLOAT *a, const FLOAT *b) return out; } +FLOAT WINAPI D3DXSHDot(UINT order, CONST FLOAT *a, CONST FLOAT *b) +{ + FLOAT s; + UINT i; + + TRACE("order %u, a %p, b %p\n", order, a, b); + + s = a[0] * b[0]; + for (i = 1; i < order * order; i++) + s += a[i] * b[i]; + + return s; +} + FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b) { FLOAT t, ta, tb; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 70290bf..cc6170f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2399,6 +2399,29 @@ static void test_D3DXSHAdd(void) } } +static void test_D3DXSHDot(void) +{ + unsigned int i; + FLOAT a[64], b[64], got; + CONST FLOAT expected[] = + { 0.5f, 0.5f, 25.0f, 262.5f, 1428.0f, 5362.0f, 15873.0f, 39812.0f, 88400.0f, }; + + for (i = 0; i < 64; i++) + { + a[i] = (FLOAT)i + 1.0f; + b[i] = (FLOAT)i + 0.5f; + } + + /* D3DXSHDot computes by using order * order elements */ + for (i = 0; i < 9; i++) + { + got = D3DXSHDot(i, a, b); + ok(relative_error(got, expected[i]) < admitted_error, "order %d: expected %f, received %f\n", i, expected[i], got); + } + + return; +} + static void test_D3DXSHMultiply3(void) { unsigned int i; @@ -2438,5 +2461,6 @@ START_TEST(math) test_D3DXVec_Array(); test_D3DXFloat_Array(); test_D3DXSHAdd(); + test_D3DXSHDot(); test_D3DXSHMultiply3(); } diff --git a/include/d3dx9math.h b/include/d3dx9math.h index b650b48..0cffad4 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -378,6 +378,7 @@ D3DXFLOAT16 *WINAPI D3DXFloat32To16Array(D3DXFLOAT16 *pout, CONST FLOAT *pin, UI FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n); FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, CONST FLOAT *a, CONST FLOAT *b); +FLOAT WINAPI D3DXSHDot(UINT order, CONST FLOAT *a, CONST FLOAT *b); FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); #ifdef __cplusplus

1 0