July 2013 - Wine-commits - list.winehq.org

Francois Gouget : comctl32/tests: Use ok(0) to report unexpected function calls instead of assert(0).
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 47b56f238db4f14369c0cb68e689db81c72c38ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b56f238db4f14369c0cb68e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:09:07 2013 +0200 comctl32/tests: Use ok(0) to report unexpected function calls instead of assert(0). --- dlls/comctl32/tests/imagelist.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 58a7e70..3e7adbc 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -26,7 +26,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #include "windef.h" #include "winbase.h" @@ -651,26 +650,26 @@ static struct my_IStream *impl_from_IStream(IStream *iface) static HRESULT STDMETHODCALLTYPE Test_Stream_QueryInterface(IStream *iface, REFIID riid, void **ppvObject) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static ULONG STDMETHODCALLTYPE Test_Stream_AddRef(IStream *iface) { - assert(0); + ok(0, "unexpected call\n"); return 2; } static ULONG STDMETHODCALLTYPE Test_Stream_Release(IStream *iface) { - assert(0); + ok(0, "unexpected call\n"); return 1; } static HRESULT STDMETHODCALLTYPE Test_Stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -703,13 +702,13 @@ static HRESULT STDMETHODCALLTYPE Test_Stream_Write(IStream *iface, const void *p static HRESULT STDMETHODCALLTYPE Test_Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -717,46 +716,46 @@ static HRESULT STDMETHODCALLTYPE Test_Stream_CopyTo(IStream *iface, IStream *pst ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Commit(IStream *iface, DWORD grfCommitFlags) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Revert(IStream *iface) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Clone(IStream *iface, IStream **ppstm) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Francois Gouget : twain_32/tests: Generate an error and skip instead of assert()-ing when the setup fails.
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 499eaca38bf96df9a661a7ebdaad7c59188ae147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499eaca38bf96df9a661a7ebd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:11:01 2013 +0200 twain_32/tests: Generate an error and skip instead of assert()-ing when the setup fails. --- dlls/twain_32/tests/dsm.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index f3b6f95..96381e6 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -18,7 +18,7 @@ * */ #include <stdarg.h> -#include <assert.h> + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -33,6 +33,7 @@ static DSMENTRYPROC pDSM_Entry; static BOOL dsm_RegisterWindowClasses(void) { WNDCLASSA cls; + BOOL rc; cls.style = 0; cls.lpfnWndProc = DefWindowProc; @@ -44,9 +45,10 @@ static BOOL dsm_RegisterWindowClasses(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "TWAIN_dsm_class"; - if (!RegisterClassA(&cls)) return FALSE; - return TRUE; + rc = RegisterClassA(&cls); + ok(rc, "RegisterClassA failed: le=%u\n", GetLastError()); + return rc; } @@ -832,7 +834,11 @@ START_TEST(dsm) HANDLE hwnd; HMODULE htwain; - if (!dsm_RegisterWindowClasses()) assert(0); + if (!dsm_RegisterWindowClasses()) + { + skip("Could not register the test class, skipping tests\n"); + return; + } htwain = LoadLibraryA("twain_32.dll"); if (! htwain)

1 0

Francois Gouget : setupapi/tests: Remove a pointless use of assert().
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: ce64b90c97a53c3cb5ee2249a7eef2a66ccbc25d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce64b90c97a53c3cb5ee2249a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:14:14 2013 +0200 setupapi/tests: Remove a pointless use of assert(). --- dlls/setupapi/tests/parser.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 53f7cc0..5a99423 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include "windef.h" @@ -424,7 +423,12 @@ static void test_key_names(void) if (hinf == INVALID_HANDLE_VALUE) continue; ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); - assert( ret ); + ok(ret, "SetupFindFirstLineA failed: le=%u\n", GetLastError()); + if (!ret) + { + SetupCloseInfFile( hinf ); + continue; + } check_key( &context, key_names[i].key );

1 0

Francois Gouget : mlang/tests: We already link with mlang. dll so there is no need to do a LoadLibrary() on it.
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 28139bceebd968692c78f287553513f2caa59011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28139bceebd968692c78f2875… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:15:32 2013 +0200 mlang/tests: We already link with mlang.dll so there is no need to do a LoadLibrary() on it. --- dlls/mlang/tests/mlang.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 0da31b5..1d52af6 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -230,13 +230,7 @@ static BOOL init_function_ptrs(void) { HMODULE hMlang; - hMlang = LoadLibraryA("mlang.dll"); - if (!hMlang) - { - skip("mlang not available\n"); - return FALSE; - } - + hMlang = GetModuleHandleA("mlang.dll"); pConvertINetMultiByteToUnicode = (void *)GetProcAddress(hMlang, "ConvertINetMultiByteToUnicode"); pConvertINetUnicodeToMultiByte = (void *)GetProcAddress(hMlang, "ConvertINetUnicodeToMultiByte"); pRfc1766ToLcidA = (void *)GetProcAddress(hMlang, "Rfc1766ToLcidA");

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 653354ab254e70eb846aa920ff43de75bb30773d URL: http://source.winehq.org/git/wine.git/?a=commit;h=653354ab254e70eb846aa920f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:11:13 2013 +0200 Assorted spelling fixes. --- dlls/shell32/iconcache.c | 6 +++--- dlls/shell32/tests/shelllink.c | 6 ++++-- dlls/user32/tests/edit.c | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 91f0eb5..e2300f1 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -880,11 +880,11 @@ INT WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, INT iIconIndex) /**************************************************************************** * SHGetStockIconInfo [SHELL32.@] * - * Receive informations for builtin icons + * Receive information for builtin icons * * PARAMS - * id [I] selected icon-id to get informations - * flags [I] select informations to receive + * id [I] selected icon-id to get information for + * flags [I] selects the information to receive * sii [IO] SHSTOCKICONINFO structure to fill * * RETURNS diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index a3301d8..7dc4379 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1042,8 +1042,10 @@ static void test_SHGetStockIconInfo(void) if (atleast_win7 && (i == (SIID_MAX_ICONS - 1)) && broken(hr == E_INVALIDARG)) { - /* off by one windows bug: there are SIID_MAX_ICONS icons from 0 upto - SIID_MAX_ICONS-1 on win8, but the last one is missing on win7 */ + /* Off by one windows bug: there are SIID_MAX_ICONS icons from 0 + * up to SIID_MAX_ICONS-1 on Windows 8, but the last one is missing + * on Windows 7. + */ trace("%3d: got E_INVALIDARG (windows bug: off by one)\n", i); } else if (atleast_win7 && (i < (SIID_MAX_ICONS))) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 700dfb0..fb4a8b3 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2628,7 +2628,7 @@ static void test_EM_GETHANDLE(void) len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); - /* everything is normal upto EM_GETHANDLE */ + /* everything is normal up to EM_GETHANDLE */ hmem = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); /* Some messages still work while other messages fail. After LocalFree the memory handle, messages can crash the app */

1 0

Marcus Meissner : oleaut32: Check a return value (Coverity).
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 0f86ae37c63ac9d55fe068d85440b121d03df432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f86ae37c63ac9d55fe068d85… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Jul 2 15:45:04 2013 +0200 oleaut32: Check a return value (Coverity). --- dlls/oleaut32/usrmarshal.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 495c257..0b541e4 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1070,15 +1070,16 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B Buffer += sizeof(wiresab[0]) * wiresa->cDims; if(vt) + { *ppsa = SafeArrayCreateEx(vt, wiresa->cDims, wiresab, NULL); + if (!*ppsa) RpcRaiseException(E_OUTOFMEMORY); + } else { - SafeArrayAllocDescriptor(wiresa->cDims, ppsa); - if(*ppsa) - memcpy((*ppsa)->rgsabound, wiresab, sizeof(SAFEARRAYBOUND) * wiresa->cDims); + if (FAILED(SafeArrayAllocDescriptor(wiresa->cDims, ppsa))) + RpcRaiseException(E_OUTOFMEMORY); + memcpy((*ppsa)->rgsabound, wiresab, sizeof(SAFEARRAYBOUND) * wiresa->cDims); } - if (!*ppsa) - RpcRaiseException(E_OUTOFMEMORY); /* be careful about which flags we set since they could be a security * risk */

1 0

Marcus Meissner : oleaut32/tests: Test return of SafeArrayAllocData ( Coverity).
by Alexandre Julliard 03 Jul '13

03 Jul '13

Module: wine Branch: master Commit: 9a0b4345ec1896c2ab7945ea3a96f85534e29e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0b4345ec1896c2ab7945ea3… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Jul 2 17:08:55 2013 +0200 oleaut32/tests: Test return of SafeArrayAllocData (Coverity). --- dlls/oleaut32/tests/safearray.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 289640b..469bdef 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -324,7 +324,8 @@ static void test_safearray(void) a->rgsabound[1].cElements = 4; a->rgsabound[1].lLbound = 1; a->cbElements = 2; - SafeArrayAllocData(a); + hres = SafeArrayAllocData(a); + ok(hres == S_OK, "SafeArrayAllocData failed with hres %x\n", hres); indices[0] = 4; indices[1] = 2;

1 0

Ken Thomases : winemac: Force swap interval to 0 for single-buffered contexts to avoid vsync' ed flushes.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: 967a49fcb24493dafe9c39ffa49eee3f2bea87e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=967a49fcb24493dafe9c39ffa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jul 2 01:25:00 2013 -0500 winemac: Force swap interval to 0 for single-buffered contexts to avoid vsync'ed flushes. --- dlls/winemac.drv/opengl.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 904158b..69f94e2 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -2901,7 +2901,9 @@ static BOOL macdrv_wglSwapIntervalEXT(int interval) return FALSE; } - if (interval > 1) + if (!pixel_formats[context->format - 1].double_buffer) + interval = 0; + else if (interval > 1) interval = 1; value = interval; @@ -3238,8 +3240,14 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share) } /* According to the WGL_EXT_swap_control docs, the default swap interval for - a context is 1. CGL contexts default to 0, so we need to set it. */ - swap_interval = 1; + a context is 1. CGL contexts default to 0, so we need to set it. This + only make sense for double-buffered contexts, though. In theory, for + single-buffered contexts, there's no such thing as a swap. But OS X + will synchronize flushes of single-buffered contexts if this is set. */ + if (pf->double_buffer) + swap_interval = 1; + else + swap_interval = 0; err = CGLSetParameter(context->cglcontext, kCGLCPSwapInterval, (GLint*)&swap_interval); if (err != kCGLNoError) WARN("CGLSetParameter(kCGLCPSwapInterval) failed with error %d %s; leaving un-vsynced\n", err, CGLErrorString(err));

1 0

Ken Thomases : winemac: Add registry setting to control glFlush() skipping for single-buffer contexts and disable it by default.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: b7c7d094709af3429eaec6df28ef13050e250624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c7d094709af3429eaec6df2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jul 2 01:25:32 2013 -0500 winemac: Add registry setting to control glFlush() skipping for single-buffer contexts and disable it by default. --- dlls/winemac.drv/macdrv.h | 3 +++ dlls/winemac.drv/macdrv_main.c | 4 ++++ dlls/winemac.drv/opengl.c | 3 ++- 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 0f39e5d..4c761af 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -35,6 +35,9 @@ #include "wine/gdi_driver.h" +extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; + + extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; static inline CGRect cgrect_from_rect(RECT rect) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 470553e..29dc0b7 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -47,6 +47,7 @@ DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; int topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN; int capture_displays_for_fullscreen = 0; +BOOL skip_single_buffer_flushes = FALSE; /************************************************************************** @@ -156,6 +157,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "CaptureDisplaysForFullscreen", buffer, sizeof(buffer))) capture_displays_for_fullscreen = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "SkipSingleBufferFlushes", buffer, sizeof(buffer))) + skip_single_buffer_flushes = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 69f94e2..abd563a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3051,9 +3051,10 @@ static BOOL init_opengl(void) #define REDIRECT(func) \ do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = macdrv_##func; } while(0) REDIRECT(glCopyPixels); - REDIRECT(glFlush); REDIRECT(glReadPixels); REDIRECT(glViewport); + if (skip_single_buffer_flushes) + REDIRECT(glFlush); #undef REDIRECT /* redirect some OpenGL extension functions */

1 0

Ken Thomases : winemac: Add registry setting to disable vertical sync.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: 9e878cb92c41866b7239928b8f728ac2752e475c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e878cb92c41866b7239928b8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jul 2 01:25:50 2013 -0500 winemac: Add registry setting to disable vertical sync. --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ dlls/winemac.drv/opengl.c | 11 +++++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 4c761af..3c7bea5 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -36,6 +36,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; +extern BOOL allow_vsync DECLSPEC_HIDDEN; extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 29dc0b7..6bae707 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -48,6 +48,7 @@ DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; int topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN; int capture_displays_for_fullscreen = 0; BOOL skip_single_buffer_flushes = FALSE; +BOOL allow_vsync = TRUE; /************************************************************************** @@ -160,6 +161,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "SkipSingleBufferFlushes", buffer, sizeof(buffer))) skip_single_buffer_flushes = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "AllowVerticalSync", buffer, sizeof(buffer))) + allow_vsync = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index abd563a..0922371 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -2988,9 +2988,12 @@ static void load_extensions(void) register_extension("WGL_EXT_extensions_string"); opengl_funcs.ext.p_wglGetExtensionsStringEXT = macdrv_wglGetExtensionsStringEXT; - register_extension("WGL_EXT_swap_control"); - opengl_funcs.ext.p_wglSwapIntervalEXT = macdrv_wglSwapIntervalEXT; - opengl_funcs.ext.p_wglGetSwapIntervalEXT = macdrv_wglGetSwapIntervalEXT; + if (allow_vsync) + { + register_extension("WGL_EXT_swap_control"); + opengl_funcs.ext.p_wglSwapIntervalEXT = macdrv_wglSwapIntervalEXT; + opengl_funcs.ext.p_wglGetSwapIntervalEXT = macdrv_wglGetSwapIntervalEXT; + } /* Presumably identical to [W]GL_ARB_framebuffer_sRGB, above, but clients may check for either, so register them separately. */ @@ -3245,7 +3248,7 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share) only make sense for double-buffered contexts, though. In theory, for single-buffered contexts, there's no such thing as a swap. But OS X will synchronize flushes of single-buffered contexts if this is set. */ - if (pf->double_buffer) + if (pf->double_buffer && allow_vsync) swap_interval = 1; else swap_interval = 0;

1 0