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

André Hentschel : msctf: Remove superfluous casts.
by Alexandre Julliard July 2, 2013

July 2, 2013

Module: wine Branch: master Commit: 795c732c0d332b024fb17d723ca26eace0b323e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=795c732c0d332b024fb17d723… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 1 22:06:32 2013 +0200 msctf: Remove superfluous casts. --- dlls/msctf/compartmentmgr.c | 2 +- dlls/msctf/context.c | 2 +- dlls/msctf/inputprocessor.c | 2 +- dlls/msctf/threadmgr.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index a5bae3f..35ebe2a 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -617,7 +617,7 @@ static HRESULT WINAPI CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdw if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_COMPARTMENTSINK) return E_INVALIDARG; - sink = (CompartmentSink*)remove_Cookie(pdwCookie); + sink = remove_Cookie(pdwCookie); if (!sink) return CONNECT_E_NOCONNECTION; diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 147805c..9d6cf86 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -642,7 +642,7 @@ static HRESULT WINAPI ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCook if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_CONTEXTSINK) return E_INVALIDARG; - sink = (ContextSink*)remove_Cookie(pdwCookie); + sink = remove_Cookie(pdwCookie); if (!sink) return CONNECT_E_NOCONNECTION; diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 2340604..9c68007 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -739,7 +739,7 @@ static HRESULT WINAPI IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_IPPSINK) return E_INVALIDARG; - sink = (InputProcessorProfilesSink*)remove_Cookie(pdwCookie); + sink = remove_Cookie(pdwCookie); if (!sink) return CONNECT_E_NOCONNECTION; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 63c7ba0..48f33c7 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -662,7 +662,7 @@ static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCo if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_TMSINK) return E_INVALIDARG; - sink = (ThreadMgrSink*)remove_Cookie(pdwCookie); + sink = remove_Cookie(pdwCookie); if (!sink) return CONNECT_E_NOCONNECTION;

1 0

Alexandre Julliard : makefiles: Avoid wildcard substitutions that are broken in BSD make.
by Alexandre Julliard July 2, 2013

July 2, 2013

Module: wine Branch: master Commit: ebe555d1461c588d8ff649471f5ba596899c5af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe555d1461c588d8ff649471… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 12:40:59 2013 +0200 makefiles: Avoid wildcard substitutions that are broken in BSD make. --- Make.rules.in | 9 +++++---- tools/Makefile.in | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 3bc86da..486a437 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -25,9 +25,10 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl= $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h) CLEAN_FILES = *.o *.a *.so *.mo *.ln *.res *.fake core -CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \ +CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) \ + $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:.idl=_p.c dlldata.c) \ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ - $(PO_SRCS:%=rsrc.pot) $(MC_SRCS:%=msg.pot) $(XTEMPLATE_SRCS:.x=.h) + $(PO_SRCS:.rc=.res rsrc.pot) $(MC_SRCS:.mc=.res msg.pot) $(XTEMPLATE_SRCS:.x=.h) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) @@ -162,8 +163,8 @@ install-man-pages:: $(MANPAGE) $(DESTDIR)$(mandir)/man$(prog_manext) uninstall-man-pages:: $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/$(MANPAGE:.man=).$(prog_manext) -install:: @WOW64_DISABLE@ $(MANPAGE:%=install-man-pages) -uninstall:: @WOW64_DISABLE@ $(MANPAGE:%=uninstall-man-pages) +install:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in install-man-pages) +uninstall:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in uninstall-man-pages) # Rules for cleaning diff --git a/tools/Makefile.in b/tools/Makefile.in index f26bd72..d9aad04 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -41,7 +41,7 @@ all: makedep$(EXEEXT) $(PROGRAMS) @MAKE_RULES@ -makedep$(EXEEXT) $(EXEEXT:%=makedep): makedep.o +makedep $(EXEEXT:%=makedep%): makedep.o $(CC) $(CFLAGS) -o $@ makedep.o $(LDFLAGS) make_ctests$(EXEEXT): make_ctests.o

1 0

Alexandre Julliard : makefiles: Make sure to install manpages for the install-lib and install-dev cases.
by Alexandre Julliard July 2, 2013

July 2, 2013

Module: wine Branch: master Commit: 005565d90df24e28a4ae3baaed5f029aa3948ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=005565d90df24e28a4ae3baae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 12:50:24 2013 +0200 makefiles: Make sure to install manpages for the install-lib and install-dev cases. --- Make.rules.in | 2 ++ loader/Makefile.in | 4 ++-- tools/widl/Makefile.in | 2 +- tools/winebuild/Makefile.in | 2 +- tools/winedump/Makefile.in | 2 +- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 486a437..b7b89f5 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -166,6 +166,8 @@ uninstall-man-pages:: install:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in install-man-pages) uninstall:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in uninstall-man-pages) +.PHONY: install-man-pages uninstall-man-pages + # Rules for cleaning $(EXTRASUBDIRS:%=%/__clean__): dummy diff --git a/loader/Makefile.in b/loader/Makefile.in index 0cb80a8..a7ab893 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -51,9 +51,9 @@ wine_info.plist: wine_info.plist.in $(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy f=`expr $@ : '__install__$.*$'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f -.PHONY: install-man-pages $(EXTRA_BINARIES:%=__install__%) +.PHONY: $(EXTRA_BINARIES:%=__install__%) -install install-lib:: wine-installed $(DESTDIR)$(bindir) $(EXTRA_BINARIES:%=__install__%) +install install-lib:: wine-installed $(DESTDIR)$(bindir) $(EXTRA_BINARIES:%=__install__%) @WOW64_DISABLE@ install-man-pages $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MAIN_BINARY) install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) dummy diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 88558bb..4bbcf1e 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -31,7 +31,7 @@ all: $(PROGRAMS) widl$(EXEEXT): $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBPORT) $(LDFLAGS) -install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) widl$(EXEEXT) $(DESTDIR)$(bindir)/widl$(EXEEXT) uninstall:: diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index 2017129..96bc4f9 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -23,7 +23,7 @@ all: $(PROGRAMS) winebuild$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS) -install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) winebuild$(EXEEXT) $(DESTDIR)$(bindir)/winebuild$(EXEEXT) uninstall:: diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index e8e4323..ce61682 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -34,7 +34,7 @@ all: $(PROGRAMS) winedump$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o winedump$(EXEEXT) $(OBJS) $(LIBPORT) $(LDFLAGS) -install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) winedump$(EXEEXT) $(DESTDIR)$(bindir)/winedump$(EXEEXT) $(INSTALL_SCRIPT) $(srcdir)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index a3ba3dd..fc079f7 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -25,7 +25,7 @@ wmc$(EXEEXT): $(OBJS) wmc-installed: $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_INSTALL) -install install-dev:: wmc-installed $(DESTDIR)$(bindir) +install install-dev:: wmc-installed $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) wmc-installed $(DESTDIR)$(bindir)/wmc$(EXEEXT) uninstall:: diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 5092adb..6347dc1 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -29,7 +29,7 @@ wrc$(EXEEXT): $(OBJS) $(LIBWPP) wrc-installed: $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_INSTALL) -install install-dev:: wrc-installed $(DESTDIR)$(bindir) +install install-dev:: wrc-installed $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) wrc-installed $(DESTDIR)$(bindir)/wrc$(EXEEXT) uninstall::

1 0

Alexandre Julliard : user32: Check for driver events more quickly once we start getting timer messages.
by Alexandre Julliard July 2, 2013

July 2, 2013

Module: wine Branch: master Commit: fa311c57bf6c972b854772962b89b45c8ead5c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa311c57bf6c972b854772962… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 15:06:16 2013 +0200 user32: Check for driver events more quickly once we start getting timer messages. --- dlls/user32/message.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a6a839c..27e3441 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3683,13 +3683,18 @@ void WINAPI PostQuitMessage( INT exit_code ) } /* check for driver events if we detect that the app is not properly consuming messages */ -static inline void check_for_driver_events(void) +static inline void check_for_driver_events( UINT msg ) { if (get_user_thread_info()->message_count > 200) { flush_window_surfaces( FALSE ); USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); } + else if (msg == WM_TIMER || msg == WM_SYSTIMER) + { + /* driver events should have priority over timers, so make sure we'll check for them soon */ + get_user_thread_info()->message_count += 100; + } else get_user_thread_info()->message_count++; } @@ -3701,7 +3706,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, MSG msg; USER_CheckNotLock(); - check_for_driver_events(); + check_for_driver_events( 0 ); if (!peek_message( &msg, hwnd, first, last, flags, 0 )) { @@ -3713,6 +3718,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, if (ret == WAIT_TIMEOUT || !peek_message( &msg, hwnd, first, last, flags, 0 )) return FALSE; } + check_for_driver_events( msg.message ); + /* copy back our internal safe copy of message data to msg_out. * msg_out is a variable from the *program*, so it can't be used * internally as it can get "corrupted" by our use of SendMessage() @@ -3748,7 +3755,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ USER_CheckNotLock(); - check_for_driver_events(); + check_for_driver_events( 0 ); if (first || last) { @@ -3766,6 +3773,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT flush_window_surfaces( TRUE ); wow_handlers.wait_message( 1, &server_queue, INFINITE, mask, 0 ); } + check_for_driver_events( msg->message ); return (msg->message != WM_QUIT); }

1 0

Akira Nakagawa : po: Update Japanese translation.
by Alexandre Julliard July 2, 2013

July 2, 2013

Module: wine Branch: master Commit: 0fb9de61a5026ac6cf16bc3385c3828850a4c831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb9de61a5026ac6cf16bc338… Author: Akira Nakagawa <matyapiro31(a)gmail.com> Date: Sun Jun 30 13:04:43 2013 +0900 po: Update Japanese translation. --- po/ja.po | 194 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 98 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0fb9de61a5026ac6cf16b…

1 0

Ken Thomases : winemac: Add registry setting to control glFlush() skipping for single-buffer contexts and disable it by default.
by Alexandre Julliard July 2, 2013

July 2, 2013

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

Mosaab Alzoubi : po: Update Arabic translation.
by Alexandre Julliard July 2, 2013

July 2, 2013

Module: wine Branch: master Commit: 694e4f5b76cf7f80beb947401263b1be77147ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=694e4f5b76cf7f80beb947401… Author: Mosaab Alzoubi <moceap(a)hotmail.com> Date: Mon Jul 1 15:49:37 2013 +0300 po: Update Arabic translation. --- po/ar.po | 6895 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 3606 insertions(+), 3289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=694e4f5b76cf7f80beb94…

1 0

Mosaab Alzoubi : wine.desktop: Add Arabic title.
by Alexandre Julliard July 2, 2013

July 2, 2013

Module: wine Branch: master Commit: 5aac4b395e71c33883763c583d163551cd40c013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aac4b395e71c33883763c583… Author: Mosaab Alzoubi <moceap(a)hotmail.com> Date: Mon Jul 1 16:53:07 2013 +0300 wine.desktop: Add Arabic title. --- tools/wine.desktop | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 234e7e2..04f7da8 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Type=Application Name=Wine Windows Program Loader +Name[ar]=منظومة واين لتشغيل برامج وندوز Name[cs]=Zavaděč programů pro Wine Name[de]=Wine Windows-Programmstarter Name[es]=Wine Cargador de programas de Windows

1 0

Ken Thomases : winemac: Add registry setting to disable vertical sync.
by Alexandre Julliard July 2, 2013

July 2, 2013

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

Jacek Caban : oleaut32: Fixed duplicated UUIDs and relevant tests.
by Alexandre Julliard July 2, 2013

July 2, 2013

Module: wine Branch: master Commit: 9b3d0fca577004ed9cbcf92875f6b16681f8bb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b3d0fca577004ed9cbcf9287… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 2 15:16:04 2013 +0200 oleaut32: Fixed duplicated UUIDs and relevant tests. Spotted by Thomas Faber. --- dlls/oleaut32/tests/tmarshal.c | 24 +++++++++++++++--------- dlls/oleaut32/tests/tmarshal.idl | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index e4019bd..5d9aba9 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -152,6 +152,7 @@ static void end_host_object(DWORD tid, HANDLE thread) } static int external_connections; +static BOOL expect_last_release_closes; static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) { @@ -187,12 +188,9 @@ static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *if ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); ok(!reserved, "reserved = %x\n", reserved); - /* This may need to be adjusted if we'll add more complex tests. */ - if(--external_connections) - ok(!fLastReleaseCloses, "fLastReleaseCloses = %x\n", fLastReleaseCloses); - else - ok(fLastReleaseCloses, "fLastReleaseCloses = %x\n", fLastReleaseCloses); - return external_connections; + ok(fLastReleaseCloses == expect_last_release_closes, "fLastReleaseCloses = %x, expected %x\n", + fLastReleaseCloses, expect_last_release_closes); + return --external_connections; } static const IExternalConnectionVtbl ExternalConnectionVtbl = { @@ -1842,6 +1840,7 @@ static void test_external_connection(void) external_connections = 0; /* Marshaling an interface increases external connection count. */ + expect_last_release_closes = FALSE; hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); tid = start_host_object(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHLFLAGS_NORMAL, &thread); @@ -1855,14 +1854,17 @@ static void test_external_connection(void) IStream_Release(stream); ok(external_connections == 1, "external_connections = %d\n", external_connections); - /* Creating a stub for new iface does not cause new external connection. */ + /* Creating a stub for new iface causes new external connection. */ hres = ItestDual_QueryInterface(iface, &IID_ITestSecondDisp, (void**)&second); ok(hres == S_OK, "Could not get ITestSecondDisp iface: %08x\n", hres); - ok(external_connections == 1, "external_connections = %d\n", external_connections); + todo_wine + ok(external_connections == 2, "external_connections = %d\n", external_connections); ITestSecondDisp_Release(second); - ok(external_connections == 1, "external_connections = %d\n", external_connections); + todo_wine + ok(external_connections == 2, "external_connections = %d\n", external_connections); + expect_last_release_closes = TRUE; ItestDual_Release(iface); ok(external_connections == 0, "external_connections = %d\n", external_connections); @@ -1872,10 +1874,12 @@ static void test_external_connection(void) hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); + expect_last_release_closes = FALSE; hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); ok(external_connections == 1, "external_connections = %d\n", external_connections); + expect_last_release_closes = TRUE; IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); @@ -1885,6 +1889,7 @@ static void test_external_connection(void) hres = CreateStreamOnHGlobal(NULL, TRUE, &stream2); ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); + expect_last_release_closes = FALSE; IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); @@ -1899,6 +1904,7 @@ static void test_external_connection(void) ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); ok(external_connections == 1, "external_connections = %d\n", external_connections); + expect_last_release_closes = TRUE; IStream_Seek(stream2, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream2); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 0f0186b..b130346 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -77,7 +77,7 @@ library TestTypelib odl, oleautomation, dual, - uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c7967) + uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c7969) ] interface ITestSecondDisp : IDispatch {

1 0