wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Francois Gouget : msvcp60: Make _Lockit_ctor_locktype() static.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 5dbdab59e5c12b42f2a1aa8d2b257f839c84415b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dbdab59e5c12b42f2a1aa8d2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 28 17:01:04 2012 +0200 msvcp60: Make _Lockit_ctor_locktype() static. --- dlls/msvcp60/misc.c | 2 +- dlls/msvcp60/msvcp.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 61cf4a5..7fd234f 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -101,7 +101,7 @@ void free_lockit(void) { DeleteCriticalSection(&lockit_cs); } -_Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) +static _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) { EnterCriticalSection(&lockit_cs); return this; diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index 27d5366..7a4c041 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -266,7 +266,6 @@ typedef struct { void init_lockit(void); void free_lockit(void); -_Lockit* __thiscall _Lockit_ctor_locktype(_Lockit*, int); void __thiscall _Lockit_dtor(_Lockit*); /* class mutex */

1 0

Francois Gouget : opencl: We still use the deprecated OpenCL 1.1 APIs.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 1c640fd80b49d704559781065387eb9fc70d744c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c640fd80b49d704559781065… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 28 16:22:38 2012 +0200 opencl: We still use the deprecated OpenCL 1.1 APIs. --- dlls/opencl/opencl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 9b466ec..f3e6e79 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); #if defined(HAVE_CL_CL_H) +#define CL_USE_DEPRECATED_OPENCL_1_1_APIS #include <CL/cl.h> #elif defined(HAVE_OPENCL_OPENCL_H) #include <OpenCL/opencl.h>

1 0

Henri Verbeet : ddraw: Prevent ddraw from being unloaded.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: f95f4660602aad2e6564af3e3a933a68a36b4e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f95f4660602aad2e6564af3e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 28 13:11:14 2012 +0200 ddraw: Prevent ddraw from being unloaded. --- dlls/ddraw/main.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index db79184..61e8ec9 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -812,6 +812,7 @@ DllMain(HINSTANCE hInstDLL, TRACE("(%p,%x,%p)\n", hInstDLL, Reason, lpv); if (Reason == DLL_PROCESS_ATTACH) { + static HMODULE ddraw_self; char buffer[MAX_PATH+10]; DWORD size = sizeof(buffer); HKEY hkey = 0; @@ -911,6 +912,16 @@ DllMain(HINSTANCE hInstDLL, RegCloseKey( hkey ); } + /* Prevent the ddraw module from being unloaded. When switching to + * exclusive mode, we replace the window proc of the ddraw window. If + * an application would unload ddraw from the WM_DESTROY handler for + * that window, it would return to unmapped memory and die. Apparently + * this is supposed to work on Windows. We should probably use + * GET_MODULE_HANDLE_EX_FLAG_PIN for this, but that's not currently + * implemented. */ + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&ddraw_self, &ddraw_self)) + ERR("Failed to get own module handle.\n"); + instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); }

1 0

Henri Verbeet : wined3d: Use the device name stored in the adapter in wined3d_get_adapter_mode_count ().
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 194ee40e076e7e79caf1e2149356f09f8d59ed9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=194ee40e076e7e79caf1e2149… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 28 13:11:13 2012 +0200 wined3d: Use the device name stored in the adapter in wined3d_get_adapter_mode_count(). --- dlls/wined3d/directx.c | 55 +++++++++++++++++++++--------------------------- 1 files changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 875c333..0cff039 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2894,48 +2894,41 @@ HMONITOR CDECL wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT a UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id) { + const struct wined3d_adapter *adapter; + const struct wined3d_format *format; + unsigned int i = 0; + unsigned int j = 0; + UINT format_bits; + DEVMODEW mode; + TRACE("wined3d %p, adapter_idx %u, format %s.\n", wined3d, adapter_idx, debug_d3dformat(format_id)); if (adapter_idx >= wined3d->adapter_count) return 0; - /* TODO: Store modes per adapter and read it from the adapter structure */ - if (!adapter_idx) - { - const struct wined3d_format *format = wined3d_get_format(&wined3d->adapters[adapter_idx].gl_info, format_id); - UINT format_bits = format->byte_count * CHAR_BIT; - unsigned int i = 0; - unsigned int j = 0; - DEVMODEW mode; + adapter = &wined3d->adapters[adapter_idx]; + format = wined3d_get_format(&adapter->gl_info, format_id); + format_bits = format->byte_count * CHAR_BIT; - memset(&mode, 0, sizeof(mode)); - mode.dmSize = sizeof(mode); + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); - while (EnumDisplaySettingsExW(NULL, j, &mode, 0)) + while (EnumDisplaySettingsExW(adapter->DeviceName, j++, &mode, 0)) + { + if (format_id == WINED3DFMT_UNKNOWN) { - ++j; - - if (format_id == WINED3DFMT_UNKNOWN) - { - /* This is for D3D8, do not enumerate P8 here */ - if (mode.dmBitsPerPel == 32 || mode.dmBitsPerPel == 16) ++i; - } - else if (mode.dmBitsPerPel == format_bits) - { - ++i; - } + /* This is for d3d8, do not enumerate P8 here. */ + if (mode.dmBitsPerPel == 32 || mode.dmBitsPerPel == 16) ++i; + } + else if (mode.dmBitsPerPel == format_bits) + { + ++i; } - - TRACE("Returning %u matching modes (out of %u total) for adapter %u.\n", i, j, adapter_idx); - - return i; - } - else - { - FIXME("Adapter not primary display.\n"); } - return 0; + TRACE("Returning %u matching modes (out of %u total) for adapter %u.\n", i, j, adapter_idx); + + return i; } /* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */

1 0

Henri Verbeet : wined3d: Use the device name stored in the adapter in wined3d_enum_adapter_modes().
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: e9d0367d296994edb512170fa7839a2d728de25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d0367d296994edb512170fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 28 13:11:12 2012 +0200 wined3d: Use the device name stored in the adapter in wined3d_enum_adapter_modes(). --- dlls/wined3d/directx.c | 94 ++++++++++++++++++++++------------------------- 1 files changed, 44 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b02f01e..875c333 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2942,71 +2942,65 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, UINT mode_idx, struct wined3d_display_mode *mode) { + const struct wined3d_adapter *adapter; + const struct wined3d_format *format; + UINT format_bits; + DEVMODEW m; + UINT i = 0; + int j = 0; + TRACE("wined3d %p, adapter_idx %u, format %s, mode_idx %u, mode %p.\n", wined3d, adapter_idx, debug_d3dformat(format_id), mode_idx, mode); if (!mode || adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; - /* TODO: Store modes per adapter and read it from the adapter structure */ - if (!adapter_idx) - { - const struct wined3d_format *format = wined3d_get_format(&wined3d->adapters[adapter_idx].gl_info, format_id); - UINT format_bits = format->byte_count * CHAR_BIT; - DEVMODEW DevModeW; - UINT i = 0; - int j = 0; + adapter = &wined3d->adapters[adapter_idx]; + format = wined3d_get_format(&adapter->gl_info, format_id); + format_bits = format->byte_count * CHAR_BIT; - ZeroMemory(&DevModeW, sizeof(DevModeW)); - DevModeW.dmSize = sizeof(DevModeW); + memset(&m, 0, sizeof(m)); + m.dmSize = sizeof(m); - /* If we are filtering to a specific format (D3D9), then need to skip - all unrelated modes, but if mode is irrelevant (D3D8), then we can - just count through the ones with valid bit depths */ - while (i <= mode_idx) + while (i <= mode_idx) + { + if (!EnumDisplaySettingsExW(adapter->DeviceName, j++, &m, 0)) { - if (!EnumDisplaySettingsExW(NULL, j++, &DevModeW, 0)) - { - WARN("Invalid mode_idx %u.\n", mode_idx); - return WINED3DERR_INVALIDCALL; - } - - if (format_id == WINED3DFMT_UNKNOWN) - { - /* This is for D3D8, do not enumerate P8 here */ - if (DevModeW.dmBitsPerPel == 32 || DevModeW.dmBitsPerPel == 16) ++i; - } - else if (DevModeW.dmBitsPerPel == format_bits) - { - ++i; - } + WARN("Invalid mode_idx %u.\n", mode_idx); + return WINED3DERR_INVALIDCALL; } - mode->width = DevModeW.dmPelsWidth; - mode->height = DevModeW.dmPelsHeight; - mode->refresh_rate = DEFAULT_REFRESH_RATE; - if (DevModeW.dmFields & DM_DISPLAYFREQUENCY) - mode->refresh_rate = DevModeW.dmDisplayFrequency; - if (format_id == WINED3DFMT_UNKNOWN) - mode->format_id = pixelformat_for_depth(DevModeW.dmBitsPerPel); - else - mode->format_id = format_id; + { + /* This is for d3d8, do not enumerate P8 here. */ + if (m.dmBitsPerPel == 32 || m.dmBitsPerPel == 16) ++i; + } + else if (m.dmBitsPerPel == format_bits) + { + ++i; + } + } - if (!(DevModeW.dmFields & DM_DISPLAYFLAGS)) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - else if (DevModeW.u2.dmDisplayFlags & DM_INTERLACED) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; - else - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; + mode->width = m.dmPelsWidth; + mode->height = m.dmPelsHeight; + mode->refresh_rate = DEFAULT_REFRESH_RATE; + if (m.dmFields & DM_DISPLAYFREQUENCY) + mode->refresh_rate = m.dmDisplayFrequency; - TRACE("%ux%u@%u %u bpp, %s %#x.\n", mode->width, mode->height, mode->refresh_rate, - DevModeW.dmBitsPerPel, debug_d3dformat(mode->format_id), mode->scanline_ordering); - } + if (format_id == WINED3DFMT_UNKNOWN) + mode->format_id = pixelformat_for_depth(m.dmBitsPerPel); else - { - FIXME("Adapter not primary display.\n"); - } + mode->format_id = format_id; + + if (!(m.dmFields & DM_DISPLAYFLAGS)) + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + else if (m.u2.dmDisplayFlags & DM_INTERLACED) + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; + else + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; + + TRACE("%ux%u@%u %u bpp, %s %#x.\n", mode->width, mode->height, mode->refresh_rate, + m.dmBitsPerPel, debug_d3dformat(mode->format_id), mode->scanline_ordering); return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Avoid a redundant call to EnumDisplaySettingsExW() in wined3d_enum_adapter_modes().
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: b6bdb4286d629cfef58cb14db4e4dbe7ec44b0b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6bdb4286d629cfef58cb14db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 28 13:11:11 2012 +0200 wined3d: Avoid a redundant call to EnumDisplaySettingsExW() in wined3d_enum_adapter_modes(). --- dlls/wined3d/directx.c | 40 ++++++++++++++-------------------------- 1 files changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 88e6a91..b02f01e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2954,7 +2954,6 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada const struct wined3d_format *format = wined3d_get_format(&wined3d->adapters[adapter_idx].gl_info, format_id); UINT format_bits = format->byte_count * CHAR_BIT; DEVMODEW DevModeW; - int ModeIdx = 0; UINT i = 0; int j = 0; @@ -2983,34 +2982,23 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada } } - ModeIdx = j - 1; + mode->width = DevModeW.dmPelsWidth; + mode->height = DevModeW.dmPelsHeight; + mode->refresh_rate = DEFAULT_REFRESH_RATE; + if (DevModeW.dmFields & DM_DISPLAYFREQUENCY) + mode->refresh_rate = DevModeW.dmDisplayFrequency; - /* Now get the display mode via the calculated index */ - if (EnumDisplaySettingsExW(NULL, ModeIdx, &DevModeW, 0)) - { - mode->width = DevModeW.dmPelsWidth; - mode->height = DevModeW.dmPelsHeight; - mode->refresh_rate = DEFAULT_REFRESH_RATE; - if (DevModeW.dmFields & DM_DISPLAYFREQUENCY) - mode->refresh_rate = DevModeW.dmDisplayFrequency; + if (format_id == WINED3DFMT_UNKNOWN) + mode->format_id = pixelformat_for_depth(DevModeW.dmBitsPerPel); + else + mode->format_id = format_id; - if (format_id == WINED3DFMT_UNKNOWN) - mode->format_id = pixelformat_for_depth(DevModeW.dmBitsPerPel); - else - mode->format_id = format_id; - - if (!(DevModeW.dmFields & DM_DISPLAYFLAGS)) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - else if (DevModeW.u2.dmDisplayFlags & DM_INTERLACED) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; - else - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; - } + if (!(DevModeW.dmFields & DM_DISPLAYFLAGS)) + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + else if (DevModeW.u2.dmDisplayFlags & DM_INTERLACED) + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; else - { - TRACE("Requested mode %u out of range.\n", mode_idx); - return WINED3DERR_INVALIDCALL; - } + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; TRACE("%ux%u@%u %u bpp, %s %#x.\n", mode->width, mode->height, mode->refresh_rate, DevModeW.dmBitsPerPel, debug_d3dformat(mode->format_id), mode->scanline_ordering);

1 0

Henri Verbeet : wined3d: Avoid a useless call to wined3d_get_adapter_mode_count() in wined3d_enum_adapter_modes().
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 91f02018c59cb0254556d513f4881dd2354b3ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f02018c59cb0254556d513f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 28 13:11:10 2012 +0200 wined3d: Avoid a useless call to wined3d_get_adapter_mode_count() in wined3d_enum_adapter_modes(). --- dlls/wined3d/directx.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1cce96b..88e6a91 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2945,12 +2945,8 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada TRACE("wined3d %p, adapter_idx %u, format %s, mode_idx %u, mode %p.\n", wined3d, adapter_idx, debug_d3dformat(format_id), mode_idx, mode); - /* Validate the parameters as much as possible */ - if (!mode || adapter_idx >= wined3d->adapter_count - || mode_idx >= wined3d_get_adapter_mode_count(wined3d, adapter_idx, format_id)) - { + if (!mode || adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; - } /* TODO: Store modes per adapter and read it from the adapter structure */ if (!adapter_idx) @@ -2968,8 +2964,14 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada /* If we are filtering to a specific format (D3D9), then need to skip all unrelated modes, but if mode is irrelevant (D3D8), then we can just count through the ones with valid bit depths */ - while (i <= mode_idx && EnumDisplaySettingsExW(NULL, j++, &DevModeW, 0)) + while (i <= mode_idx) { + if (!EnumDisplaySettingsExW(NULL, j++, &DevModeW, 0)) + { + WARN("Invalid mode_idx %u.\n", mode_idx); + return WINED3DERR_INVALIDCALL; + } + if (format_id == WINED3DFMT_UNKNOWN) { /* This is for D3D8, do not enumerate P8 here */ @@ -2981,11 +2983,6 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada } } - if (!i) - { - TRACE("No modes found for format %s (%#x).\n", debug_d3dformat(format_id), format_id); - return WINED3DERR_INVALIDCALL; - } ModeIdx = j - 1; /* Now get the display mode via the calculated index */

1 0

Alexandre Julliard : gdi32: Add a null WGL driver.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: e059d565ab192c76c0a150ea7b30b65d624b3713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e059d565ab192c76c0a150ea7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 16:25:22 2012 +0200 gdi32: Add a null WGL driver. --- dlls/gdi32/driver.c | 71 ++++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/opengl.c | 7 +++- 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 6bea480..ae774b0 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -50,6 +50,7 @@ static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; const struct gdi_dc_funcs *font_driver = NULL; +static const struct wgl_funcs null_wgl_driver; static CRITICAL_SECTION driver_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -386,6 +387,11 @@ static UINT nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXT return 0; } +static INT nulldrv_GetPixelFormat( HDC hdc ) +{ + return 0; +} + static UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) { return 0; @@ -660,11 +666,61 @@ static BOOL nulldrv_UnrealizePalette( HPALETTE palette ) return FALSE; } -static const struct wgl_funcs *nulldrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) +static BOOL nulldrv_wglCopyContext( HGLRC src, HGLRC dst, UINT mask ) +{ + return FALSE; +} + +static HGLRC nulldrv_wglCreateContext( HDC hdc ) +{ + return 0; +} + +static HGLRC nulldrv_wglCreateContextAttribsARB( HDC hdc, HGLRC share_ctx, const int *attribs ) +{ + return 0; +} + +static BOOL nulldrv_wglDeleteContext( HGLRC hglrc ) +{ + return FALSE; +} + +static HDC nulldrv_wglGetCurrentDC(void) +{ + return 0; +} + +static PROC nulldrv_wglGetProcAddress( LPCSTR name ) { return NULL; } +static BOOL nulldrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC hglrc ) +{ + return FALSE; +} + +static BOOL nulldrv_wglMakeCurrent( HDC hdc, HGLRC hglrc ) +{ + return FALSE; +} + +static BOOL nulldrv_wglShareLists( HGLRC org, HGLRC dst ) +{ + return FALSE; +} + +static const struct wgl_funcs *nulldrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) +{ + if (version != WINE_GDI_DRIVER_VERSION) + { + ERR( "version mismatch, opengl32 wants %u but driver has %u\n", version, WINE_GDI_DRIVER_VERSION ); + return NULL; + } + return &null_wgl_driver; +} + const struct gdi_dc_funcs null_driver = { nulldrv_AbortDoc, /* pAbortDoc */ @@ -801,6 +857,19 @@ const struct gdi_dc_funcs null_driver = GDI_PRIORITY_NULL_DRV /* priority */ }; +static const struct wgl_funcs null_wgl_driver = +{ + nulldrv_GetPixelFormat, /* p_GetPixelFormat */ + nulldrv_wglCopyContext, /* p_wglCopyContext */ + nulldrv_wglCreateContext, /* p_wglCreateContext */ + nulldrv_wglCreateContextAttribsARB, /* p_wglCreateContextAttribsARB */ + nulldrv_wglDeleteContext, /* p_wglDeleteContext */ + nulldrv_wglGetCurrentDC, /* p_wglGetCurrentDC */ + nulldrv_wglGetProcAddress, /* p_wglGetProcAddress */ + nulldrv_wglMakeContextCurrentARB, /* p_wglMakeContextCurrentARB */ + nulldrv_wglMakeCurrent, /* p_wglMakeCurrent */ + nulldrv_wglShareLists, /* p_wglShareLists */ +}; /***************************************************************************** * DRIVER_GetDriverName diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index eb8b79d..952fca9 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3444,8 +3444,11 @@ static const struct wgl_funcs * glxdrv_wine_get_wgl_driver( PHYSDEV dev, UINT ve ERR( "version mismatch, opengl32 wants %u but driver has %u\n", version, WINE_GDI_DRIVER_VERSION ); return NULL; } - if (!has_opengl()) return NULL; - return &glxdrv_wgl_funcs; + + if (has_opengl()) return &glxdrv_wgl_funcs; + + dev = GET_NEXT_PHYSDEV( dev, wine_get_wgl_driver ); + return dev->funcs->wine_get_wgl_driver( dev, version ); } static const struct gdi_dc_funcs glxdrv_funcs =

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

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

← Newer
1
...
4
5
6
7
8
9
10
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012