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

Alexandre Julliard : opengl32: Move wglCreateContext to the WGL driver.
by Alexandre Julliard June 28, 2012

June 28, 2012

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 June 28, 2012

June 28, 2012

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 June 28, 2012

June 28, 2012

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 June 28, 2012

June 28, 2012

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

Hans Leidekker : wbemprox: Add reference counting to the query object.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 992d1e15597389b0d378d86a03ae160050458cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992d1e15597389b0d378d86a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 28 09:25:13 2012 +0200 wbemprox: Add reference counting to the query object. --- dlls/wbemprox/class.c | 3 ++- dlls/wbemprox/query.c | 19 +++++++++++++++---- dlls/wbemprox/wbemprox_private.h | 4 +++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index f32ee35..e826202 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -60,7 +60,7 @@ static ULONG WINAPI enum_class_object_Release( if (!refs) { TRACE("destroying %p\n", ec); - free_query( ec->query ); + release_query( ec->query ); heap_free( ec ); } return refs; @@ -198,6 +198,7 @@ HRESULT EnumWbemClassObject_create( ec->IEnumWbemClassObject_iface.lpVtbl = &enum_class_object_vtbl; ec->refs = 1; ec->query = query; + addref_query( query ); ec->index = 0; *ppObj = &ec->IEnumWbemClassObject_iface; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 0f41d44..7e5872a 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -395,16 +395,17 @@ static HRESULT execute_view( struct view *view ) return S_OK; } -static struct query *alloc_query(void) +static struct query *create_query(void) { struct query *query; if (!(query = heap_alloc( sizeof(*query) ))) return NULL; list_init( &query->mem ); + query->refs = 1; return query; } -void free_query( struct query *query ) +static void free_query( struct query *query ) { struct list *mem, *next; @@ -416,13 +417,23 @@ void free_query( struct query *query ) heap_free( query ); } +void addref_query( struct query *query ) +{ + InterlockedIncrement( &query->refs ); +} + +void release_query( struct query *query ) +{ + if (!InterlockedDecrement( &query->refs )) free_query( query ); +} + HRESULT exec_query( const WCHAR *str, IEnumWbemClassObject **result ) { HRESULT hr; struct query *query; *result = NULL; - if (!(query = alloc_query())) return E_OUTOFMEMORY; + if (!(query = create_query())) return E_OUTOFMEMORY; hr = parse_query( str, &query->view, &query->mem ); if (hr != S_OK) goto done; hr = execute_view( query->view ); @@ -430,7 +441,7 @@ HRESULT exec_query( const WCHAR *str, IEnumWbemClassObject **result ) hr = EnumWbemClassObject_create( NULL, query, (void **)result ); done: - if (hr != S_OK) free_query( query ); + release_query( query ); return hr; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 6865ddd..e2ffce1 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -106,11 +106,13 @@ struct view struct query { + LONG refs; struct view *view; struct list mem; }; -void free_query( struct query * ) DECLSPEC_HIDDEN; +void addref_query( struct query * ) DECLSPEC_HIDDEN; +void release_query( struct query *query ) DECLSPEC_HIDDEN; HRESULT exec_query( const WCHAR *, IEnumWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT parse_query( const WCHAR *, struct view **, struct list * ) DECLSPEC_HIDDEN; HRESULT create_view( const struct property *, const WCHAR *, const struct expr *,

1 0

Hans Leidekker : wbemprox: Support IClientSecurity on the class enumerator object; .
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 0ceee481fe16ac6f731f4cb13717d5b404bb3147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ceee481fe16ac6f731f4cb13… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 28 09:24:42 2012 +0200 wbemprox: Support IClientSecurity on the class enumerator object;. --- dlls/wbemprox/class.c | 5 +++++ dlls/wbemprox/services.c | 2 +- dlls/wbemprox/wbemprox_private.h | 2 ++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index bb2c5e6..f32ee35 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -80,6 +80,11 @@ static HRESULT WINAPI enum_class_object_QueryInterface( { *ppvObject = ec; } + else if ( IsEqualGUID( riid, &IID_IClientSecurity ) ) + { + *ppvObject = &client_security; + return S_OK; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 05a9811..2e8a34a 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -130,7 +130,7 @@ static const IClientSecurityVtbl client_security_vtbl = client_security_CopyProxy }; -static IClientSecurity client_security = { &client_security_vtbl }; +IClientSecurity client_security = { &client_security_vtbl }; struct wbem_services { diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index db3cb3a..6865ddd 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -19,6 +19,8 @@ #include "wine/list.h" #include "wine/unicode.h" +IClientSecurity client_security; + #define SIZEOF(array) (sizeof(array)/sizeof((array)[0])) #define COL_TYPE_MASK 0x0000ffff

1 0

Dmitry Timoshkov : gdiplus: Add a test for image stream refcount.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 55f160db347759b0c23a5d307e5e6b824f6f4345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f160db347759b0c23a5d307… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 27 14:27:04 2012 +0900 gdiplus: Add a test for image stream refcount. --- dlls/gdiplus/tests/image.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b930b99..0285879 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2656,6 +2656,12 @@ static void test_dispose(void) expect(ObjectBusy, stat); } +static LONG obj_refcount(void *obj) +{ + IUnknown_AddRef((IUnknown *)obj); + return IUnknown_Release((IUnknown *)obj); +} + static GpImage *load_image(const BYTE *image_data, UINT image_size) { IStream *stream; @@ -2664,6 +2670,8 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) HRESULT hr; GpStatus status; GpImage *image = NULL; + ImageType image_type; + LONG refcount; hmem = GlobalAlloc(0, image_size); data = GlobalLock(hmem); @@ -2674,10 +2682,20 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); if (hr != S_OK) return NULL; + refcount = obj_refcount(stream); + ok(refcount == 1, "expected stream refcount 1, got %d\n", refcount); + status = GdipLoadImageFromStream(stream, &image); ok(status == Ok, "GdipLoadImageFromStream error %d\n", status); - IStream_Release(stream); + status = GdipGetImageType(image, &image_type); + ok(status == Ok, "GdipGetImageType error %d\n", status); + + refcount = IStream_Release(stream); + if (image_type == ImageTypeBitmap) + todo_wine ok(refcount >= 1, "expected stream refcount != 0\n"); + else + ok(refcount == 0, "expected stream refcount 0, got %d\n", refcount); return image; }

1 0

Lucas Zawacki : joy.cpl: Added POV axis visualization.
by Alexandre Julliard June 28, 2012

June 28, 2012

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 823e214ee832ecd4c3d69764ba3c865714c3d6b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=823e214ee832ecd4c3d69764b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jun 27 22:33:11 2012 +0900 po: Update Korean translation. --- po/ko.po | 45 +++++++++++++-------------------------------- 1 files changed, 13 insertions(+), 32 deletions(-) diff --git a/po/ko.po b/po/ko.po index e76d77f..44cb03f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -30,18 +30,13 @@ msgid "&Install..." msgstr "설치(&I)..." #: appwiz.rc:62 -#, fuzzy -#| msgid "" -#| "The following software can be automatically removed. To remove a program " -#| "or to modify its installed components, select it from the list and click " -#| "Change/Remove." msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"이 소프트웨어는 자동으로 삭제되었을 수도 있습니다.설치된 구성요소를 고치거나 " -"프로그램을 지우려면 , 추가/삭제 목록에서 선택하십시오." +"다음 소프트웨어는 자동으로 제거될 것입니다.프로그램을 제거하거나 설치된 구성" +"요소를 변경하려면,목록에서 선택하고 고치기/제거를 클릭하십시오." #: appwiz.rc:64 msgid "&Support Information" @@ -3419,51 +3414,43 @@ msgstr "높음" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "조이스틱" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" msgstr "사용하지 않음(&D)" #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" msgstr "가능(&E)" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "연결이 끊어짐" +msgstr "연결됨" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "사용하지 않음(&D)" +msgstr "불가능" #: joy.rc:46 msgid "Test Joystick" -msgstr "" +msgstr "조이스틱 시험" #: joy.rc:50 msgid "Buttons" -msgstr "" +msgstr "버튼" #: joy.rc:59 msgid "Test Force Feedback" -msgstr "" +msgstr "강제 피드백 시험" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "컨트롤 만들기" +msgstr "게임 컨트롤러" #: jscript.rc:25 msgid "Error converting object to primitive type" -msgstr "객페를 기본 형식으로 변환하는 중에 오류 발생" +msgstr "객체를 기본 형식으로 변환하는 중에 오류 발생" #: jscript.rc:26 msgid "Invalid procedure call or argument" @@ -13588,22 +13575,16 @@ msgid "Help topics: " msgstr "도움말 목차: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "오류:올바르지 않은 명령라인 매개변수\n" +msgstr "오류: 명령 라인은 지원하지 않음\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "속성 세트를 찾을 수 없습니다.\n" +msgstr "오류: Alias를 찾을 수 없음\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "오류: 올바르지 않은 키 이름\n" +msgstr "오류: 올바르지 않은 질의\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

Lucas Zawacki : joy.cpl: Make dialog the same size as the other cpl applets .
by Alexandre Julliard June 28, 2012

June 28, 2012

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