September 2013 - Wine-Commits

Frédéric Delanoy : winedev: Use 'methodname' tags for class methods.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: docs Branch: master Commit: c1e27ba7c13f994d0fbf8e1d1cf894c59b6b7ff1 URL: http://source.winehq.org/git/docs.git/?a=commit;h=c1e27ba7c13f994d0fbf8e1d1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 5 00:15:49 2013 +0200 winedev: Use 'methodname' tags for class methods. --- en/winedev-ddraw.sgml | 28 ++++++++++++++-------------- en/winedev-ole.sgml | 27 ++++++++++++++------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/en/winedev-ddraw.sgml b/en/winedev-ddraw.sgml index fb99df2..4fc3614 100644 --- a/en/winedev-ddraw.sgml +++ b/en/winedev-ddraw.sgml @@ -18,9 +18,9 @@ <para> Most of the DirectDraw functionality is implemented in a common base class. Derived classes are responsible for providing display - mode functions (<function>EnumDisplayModes</function>, <function>SetDisplayMode</function>, - <function>RestoreDisplayMode</function>), <function>GetCaps</function>, - <function>GetDeviceIdentifier</function> + mode methods (<methodname>EnumDisplayModes</methodname>, + <methodname>SetDisplayMode</methodname>, <methodname>RestoreDisplayMode</methodname>), + <methodname>GetCaps</methodname>, <methodname>GetDeviceIdentifier</methodname> and internal functions called to create primary and backbuffer surfaces. </para> @@ -31,7 +31,7 @@ </para> <para> <classname>XVidMode</classname> attempt to use the XFree86 VidMode extension to set the - display resolution to match the parameters to <function>SetDisplayMode</function>. + display resolution to match the parameters to <methodname>SetDisplayMode</methodname>. </para> <para> <classname>DGA2</classname> attempt to use the XFree86 DGA 2.x extension to set the @@ -150,23 +150,23 @@ <sect1 id="creatingobject"> <title>Creating Objects</title> <para> - Classes have two functions relevant to object creation, <function>Create</function> and - <function>Construct</function>. To create a new object, the <function>Create</function> - function of the class is called. It allocates enough memory for - <classname>IDirectDrawImpl</classname> or <classname>IDirectDrawSurfaceImpl</classname> + Classes have two methods relevant to object creation, <methodname>Create</methodname> + and <methodname>Construct</methodname>. To create a new object, the + <methodname>Create</methodname> method of the class is called. It allocates enough memory + for <classname>IDirectDrawImpl</classname> or <classname>IDirectDrawSurfaceImpl</classname> as well as the private data for derived classes and then calls <filename>Construct</filename>. </para> <para> - Each class <function>Construct</function> function calls the base class - <function>Construct</function>, then does the necessary initialization. + Each class <methodname>Construct</methodname> method calls the base class + <methodname>Construct</methodname>, then does the necessary initialization. </para> <para> For example, creating a primary surface with the user ddraw driver - calls <function>User_DirectDrawSurface_Create</function> which allocates memory for the - object and calls <function>User_DirectDrawSurface_Construct</function> to initialize it. - This calls <function>DIB_DirectDrawSurface_Construct</function> which calls - <function>Main_DirectDrawSurface_Construct</function>. + calls <methodname>User_DirectDrawSurface_Create</methodname> which allocates memory for the + object and calls <methodname>User_DirectDrawSurface_Construct</methodname> to initialize it. + This calls <methodname>DIB_DirectDrawSurface_Construct</methodname> which calls + <methodname>Main_DirectDrawSurface_Construct</methodname>. </para> </sect1> </chapter> diff --git a/en/winedev-ole.sgml b/en/winedev-ole.sgml index 235a04b..4343ddf 100644 --- a/en/winedev-ole.sgml +++ b/en/winedev-ole.sgml @@ -273,7 +273,7 @@ struct IDirect3DVtbl { <structfield>t.lpVtbl</structfield> defined in <interfacename>IUnknown</interfacename>, must be interpreted as the jump table pointer if we interpret the structure as the interface class, and as the function pointer to the - <function>QueryInterface</function> method, + <methodname>QueryInterface</methodname> method, <structfield>t.fnQueryInterface</structfield>, if we interpret the structure as the jump table. Fortunately this gymnastic is entirely taken care of in the header of <interfacename>IUnknown</interfacename>. @@ -659,9 +659,9 @@ static ICOM_VTABLE(IDirect3D) d3dvt = { implements <interfacename>IPSFactoryBuffer</interfacename>. </para> </listitem> <listitem> <para> <interfacename>IPSFactoryBuffer</interfacename> has only two methods, - <function>CreateProxy</function> and <function>CreateStub</function>. COM - calls whichever is appropriate: <function>CreateStub</function> for the server, - <function>CreateProxy</function> + <methodname>CreateProxy</methodname> and <methodname>CreateStub</methodname>. COM + calls whichever is appropriate: <methodname>CreateStub</methodname> for the server, + <methodname>CreateProxy</methodname> for the client. MIDL will normally provide an implementation of this object for you in the code it generates. </para></listitem> </itemizedlist> @@ -669,19 +669,20 @@ static ICOM_VTABLE(IDirect3D) d3dvt = { </para> <para> - Once <function>CreateProxy</function> has been called, the resultant object is - <function>QueryInterface</function>d to <interfacename>IRpcProxyBuffer</interfacename>, - which only has one method, <function>IRpcProxyBuffer::Connect</function>. + Once <methodname>CreateProxy</methodname> has been called, the resultant object is + <methodname>QueryInterface</methodname>d to + <interfacename>IRpcProxyBuffer</interfacename>, which only has one method, + <methodname>IRpcProxyBuffer::Connect</methodname>. This method only takes one parameter, the <interfacename>IRpcChannelBuffer</interfacename> object which encapsulates the <quote>RPC Channel</quote> between the client and server. </para> <para> On the server side, a similar process is performed: the - <classname>PSFactoryBuffer</classname> is created, <function>CreateStub</function> is - called, result is <function>QueryInterface</function>d to + <classname>PSFactoryBuffer</classname> is created, <methodname>CreateStub</methodname> is + called, result is <methodname>QueryInterface</methodname>d to <interfacename>IRpcStubBuffer</interfacename>, and - <function>IRpcStubBuffer::Connect</function> is used to link it to the RPC channel. + <methodname>IRpcStubBuffer::Connect</methodname> is used to link it to the RPC channel. </para> </sect2> @@ -743,7 +744,7 @@ static ICOM_VTABLE(IDirect3D) d3dvt = { <type>_StubMgrThread</type> thread is started. I haven't gone into the stub manager here. The important thing is that eventually a <type>_StubReaderThread</type> is started which accepts marshalled DCOM RPCs, and then passes them to - <function>IRpcStubBuffer::Invoke</function> on the correct stub object which in turn + <methodname>IRpcStubBuffer::Invoke</methodname> on the correct stub object which in turn demarshalls the packet and performs the call. The threads started by our implementation of DCOM are never terminated, they just hang around until the process dies. @@ -963,7 +964,7 @@ static ICOM_VTABLE(IDirect3D) d3dvt = { Then <function>RpcBindingFromStringBinding</function> is used to convert this remote string binding into an RPC binding handle which can be passed to the local - <function>IOXIDResolver::ResolveOxid</function> implementation + <methodname>IOXIDResolver::ResolveOxid</methodname> implementation along with the OXID. The local OXID resolver consults its list of same-machine OXIDs, then its cache of remote OXIDs, and if not found does an RPC to the remote OXID resolver using the @@ -1002,7 +1003,7 @@ static ICOM_VTABLE(IDirect3D) d3dvt = { <interfacename>IRemUnknown</interfacename> is used for lifecycle management, and for marshaling new interfaces on an object back to the client. Its definition can be seen in <filename>dcom.idl</filename> - basically the - <function>IRemUnknown::RemQueryInterface</function> method takes an IPID and a list of + <methodname>IRemUnknown::RemQueryInterface</methodname> method takes an IPID and a list of IIDs, then returns <structname>STDOBJREF</structname>s of each new marshaled interface pointer. </para>

1 0

Frédéric Delanoy : winedev: Use 'interfacename' tags for interfaces.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: docs Branch: master Commit: c6231f93694b0612fa5f131108a5448cbf317ed2 URL: http://source.winehq.org/git/docs.git/?a=commit;h=c6231f93694b0612fa5f13110… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 5 00:15:48 2013 +0200 winedev: Use 'interfacename' tags for interfaces. --- en/winedev-documentation.sgml | 2 +- en/winedev-ole.sgml | 109 +++++++++++++++++++++------------------- 2 files changed, 58 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=c6231f93694b0612fa5f1…

1 0

Alexandre Julliard : ntdll: Actually return the mount point in get_device_mount_point on Mac OS.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 6666614a1931afedd212d734b4b3cd01fd20c2fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6666614a1931afedd212d734b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 4 16:28:10 2013 +0200 ntdll: Actually return the mount point in get_device_mount_point on Mac OS. --- dlls/ntdll/directory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index f65cc9f..4af3456 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -781,8 +781,8 @@ static char *get_device_mount_point( dev_t dev ) if (stat( entry[i].f_mntfromname, &st ) == -1) continue; if (S_ISBLK(st.st_mode) && st.st_rdev == dev) { - ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(entry[i].f_mntfromname) + 1 ); - if (ret) strcpy( ret, entry[i].f_mntfromname ); + ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(entry[i].f_mntonname) + 1 ); + if (ret) strcpy( ret, entry[i].f_mntonname ); break; } }

1 0

Roderick Colenbrander : winex11: Support WGL_EXT_swap_control_tear.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: dee3418d3ad9d1d419f2e136ffdcd635ef55b2c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee3418d3ad9d1d419f2e136f… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Sep 1 21:58:54 2013 -0700 winex11: Support WGL_EXT_swap_control_tear. --- dlls/winex11.drv/opengl.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 1758de1..5ec33c8 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -281,6 +281,8 @@ static int use_render_texture_emulation = 1; /* Selects the preferred GLX swap control method for use by wglSwapIntervalEXT */ static enum glx_swap_control_method swap_control_method = GLX_SWAP_CONTROL_NONE; +/* Set when GLX_EXT_swap_control_tear is supported, requires GLX_SWAP_CONTROL_EXT */ +static BOOL has_swap_control_tear = FALSE; static CRITICAL_SECTION context_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -2937,7 +2939,10 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) TRACE("(%d)\n", interval); - if (interval < 0) + /* Without WGL/GLX_EXT_swap_control_tear a negative interval + * is invalid. + */ + if (interval < 0 && !has_swap_control_tear) { SetLastError(ERROR_INVALID_DATA); return FALSE; @@ -3135,6 +3140,11 @@ static void X11DRV_WineGL_LoadExtensions(void) if (has_extension( WineGLInfo.glxExtensions, "GLX_EXT_swap_control")) { swap_control_method = GLX_SWAP_CONTROL_EXT; + if (has_extension( WineGLInfo.glxExtensions, "GLX_EXT_swap_control_tear")) + { + register_extension("WGL_EXT_swap_control_tear"); + has_swap_control_tear = TRUE; + } } else if (has_extension( WineGLInfo.glxExtensions, "GLX_SGI_swap_control")) {

1 0

Francois Gouget : iphlpapi: Check for proc_pidinfo() instead of assuming libproc.h always defines it.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 4f27b78fb424e5623498d1d8d5f637f9334aa740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f27b78fb424e5623498d1d8d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 3 17:36:05 2013 +0200 iphlpapi: Check for proc_pidinfo() instead of assuming libproc.h always defines it. This is needed on FreeBSD 8.1. --- configure | 1 + configure.ac | 1 + dlls/iphlpapi/ipstats.c | 2 +- include/config.h.in | 3 +++ 4 files changed, 6 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 3514c1d..766ffdf 100755 --- a/configure +++ b/configure @@ -13414,6 +13414,7 @@ for ac_func in \ port_create \ prctl \ pread \ + proc_pidinfo \ pwrite \ readdir \ readlink \ diff --git a/configure.ac b/configure.ac index 8306fe2..038eec5 100644 --- a/configure.ac +++ b/configure.ac @@ -2041,6 +2041,7 @@ AC_CHECK_FUNCS(\ port_create \ prctl \ pread \ + proc_pidinfo \ pwrite \ readdir \ readlink \ diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 809dbc6..1185f08 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2046,7 +2046,7 @@ static unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entri procstat_close( pstat ); return 0; -#elif defined(HAVE_LIBPROC_H) +#elif defined(HAVE_PROC_PIDINFO) struct proc_fdinfo *fds; struct socket_fdinfo sock; unsigned int i, j, n, fd_len; diff --git a/include/config.h.in b/include/config.h.in index 643e2e1..aac10a5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -633,6 +633,9 @@ /* Define to 1 if you have the <process.h> header file. */ #undef HAVE_PROCESS_H +/* Define to 1 if you have the `proc_pidinfo' function. */ +#undef HAVE_PROC_PIDINFO + /* Define to 1 if you have the `pthread_attr_get_np' function. */ #undef HAVE_PTHREAD_ATTR_GET_NP

1 0

Hans Leidekker : winhttp: Fix the base64 decoder.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 050a46f30f42043601166e8aa435c6b97d6137cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=050a46f30f42043601166e8aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 4 15:00:35 2013 +0200 winhttp: Fix the base64 decoder. --- dlls/winhttp/request.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 35a0deb..db8e6af 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1384,7 +1384,7 @@ static unsigned int decode_base64( const WCHAR *base64, unsigned int len, char * char c0, c1, c2, c3; const WCHAR *p = base64; - while (len >= 4) + while (len > 4) { if ((c0 = decode_char( p[0] )) > 63) return 0; if ((c1 = decode_char( p[1] )) > 63) return 0; @@ -1422,6 +1422,21 @@ static unsigned int decode_base64( const WCHAR *base64, unsigned int len, char * } i += 2; } + else + { + if ((c0 = decode_char( p[0] )) > 63) return 0; + if ((c1 = decode_char( p[1] )) > 63) return 0; + if ((c2 = decode_char( p[2] )) > 63) return 0; + if ((c3 = decode_char( p[3] )) > 63) return 0; + + if (buf) + { + buf[i + 0] = (c0 << 2) | (c1 >> 4); + buf[i + 1] = (c1 << 4) | (c2 >> 2); + buf[i + 2] = (c2 << 6) | c3; + } + i += 3; + } return i; }

1 0

Dmitry Timoshkov : ntdll: NtReadFile should fail for overlapped IO on files if offset is NULL.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 2d5ecbee43f9111e8fe0c96b179d7e6c98f8416b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5ecbee43f9111e8fe0c96b1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 2 18:30:27 2013 +0900 ntdll: NtReadFile should fail for overlapped IO on files if offset is NULL. --- dlls/ntdll/file.c | 35 ++++++++++++++++++++++------------- 1 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3637b69..83e286e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -604,24 +604,33 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (type == FD_TYPE_FILE && offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */ ) + if (type == FD_TYPE_FILE) { - /* async I/O doesn't make sense on regular files */ - while ((result = pread( unix_handle, buffer, length, offset->QuadPart )) == -1) + if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !offset) { - if (errno != EINTR) + status = STATUS_INVALID_PARAMETER; + goto done; + } + + if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + { + /* async I/O doesn't make sense on regular files */ + while ((result = pread( unix_handle, buffer, length, offset->QuadPart )) == -1) { - status = FILE_GetNtStatus(); - goto done; + if (errno != EINTR) + { + status = FILE_GetNtStatus(); + goto done; + } } - } - if (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) - /* update file pointer position */ - lseek( unix_handle, offset->QuadPart + result, SEEK_SET ); + if (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) + /* update file pointer position */ + lseek( unix_handle, offset->QuadPart + result, SEEK_SET ); - total = result; - status = total ? STATUS_SUCCESS : STATUS_END_OF_FILE; - goto done; + total = result; + status = total ? STATUS_SUCCESS : STATUS_END_OF_FILE; + goto done; + } } for (;;)

1 0

André Hentschel : msvcrt: Export fabsf on ARM and x86_64.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 8fab2422a8868ac5e4ae4ae7105b3e65a21232ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fab2422a8868ac5e4ae4ae71… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 3 21:24:27 2013 +0200 msvcrt: Export fabsf on ARM and x86_64. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcrt/math.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 6c2da4c..41cb8f6 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2011,7 +2011,7 @@ @ cdecl exp(double) msvcrt.exp @ cdecl -arch=arm,x86_64 expf(float) msvcrt.expf @ cdecl fabs(double) msvcrt.fabs -@ stub -arch=arm fabsf +@ cdecl -arch=arm,x86_64 fabsf(float) msvcrt.fabsf @ cdecl fclose(ptr) msvcrt.fclose @ cdecl feof(ptr) msvcrt.feof @ cdecl ferror(ptr) msvcrt.ferror diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a55ecb6..68b0dfe 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -289,6 +289,14 @@ float CDECL MSVCRT_ceilf( float x ) } /********************************************************************* + * fabsf (MSVCRT.@) + */ +float CDECL MSVCRT_fabsf( float x ) +{ + return fabsf(x); +} + +/********************************************************************* * floorf (MSVCRT.@) */ float CDECL MSVCRT_floorf( float x ) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7511129..d0d7679 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1276,6 +1276,7 @@ @ cdecl exp(double) MSVCRT_exp @ cdecl -arch=arm,x86_64 expf(float) MSVCRT_expf @ cdecl fabs(double) MSVCRT_fabs +@ cdecl -arch=arm,x86_64 fabsf(float) MSVCRT_fabsf @ cdecl fclose(ptr) MSVCRT_fclose @ cdecl feof(ptr) MSVCRT_feof @ cdecl ferror(ptr) MSVCRT_ferror

1 0

Roderick Colenbrander : winex11: Refactor wglSwapIntervalEXT for use with glXSwapIntervalEXT.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: e95e77a19f2210452fad975a8867f9a2886c272d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95e77a19f2210452fad975a8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Sep 1 21:58:53 2013 -0700 winex11: Refactor wglSwapIntervalEXT for use with glXSwapIntervalEXT. In preparation for WGL_EXT_swap_control_tear support, transition to using glXSwapIntervalEXT. --- dlls/winex11.drv/opengl.c | 60 +++++++++++++++++++++++++++++++++------------ 1 files changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 6bed2c0..1758de1 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -254,6 +254,13 @@ struct gl_drawable int swap_interval; }; +enum glx_swap_control_method +{ + GLX_SWAP_CONTROL_NONE, + GLX_SWAP_CONTROL_EXT, + GLX_SWAP_CONTROL_SGI +}; + /* X context to associate a struct gl_drawable to an hwnd */ static XContext gl_hwnd_context; /* X context to associate a struct gl_drawable to a pbuffer hdc */ @@ -271,7 +278,9 @@ static struct WineGLInfo WineGLInfo = { 0 }; static struct wgl_pixel_format *pixel_formats; static int nb_pixel_formats, nb_onscreen_formats; static int use_render_texture_emulation = 1; -static BOOL has_swap_control; + +/* Selects the preferred GLX swap control method for use by wglSwapIntervalEXT */ +static enum glx_swap_control_method swap_control_method = GLX_SWAP_CONTROL_NONE; static CRITICAL_SECTION context_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -384,6 +393,7 @@ static Bool (*pglXMakeContextCurrent)( Display *dpy, GLXDrawable draw, GLXDrawab /* GLX Extensions */ static GLXContext (*pglXCreateContextAttribsARB)(Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list); static void* (*pglXGetProcAddressARB)(const GLubyte *); +static void (*pglXSwapIntervalEXT)(Display *dpy, GLXDrawable drawable, int interval); static int (*pglXSwapIntervalSGI)(int); /* NV GLX Extension */ @@ -636,6 +646,8 @@ static BOOL has_opengl(void) #define LOAD_FUNCPTR(f) p##f = pglXGetProcAddressARB((const GLubyte *)#f) /* ARB GLX Extension */ LOAD_FUNCPTR(glXCreateContextAttribsARB); + /* EXT GLX Extension */ + LOAD_FUNCPTR(glXSwapIntervalEXT); /* SGI GLX Extension */ LOAD_FUNCPTR(glXSwapIntervalSGI); /* NV GLX Extension */ @@ -2937,27 +2949,37 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) return FALSE; } - if (!has_swap_control && interval == 0) + switch (swap_control_method) { + case GLX_SWAP_CONTROL_EXT: + X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); + pglXSwapIntervalEXT(gdi_display, gl->drawable, interval); + XSync(gdi_display, False); + ret = !X11DRV_check_error(); + break; + + case GLX_SWAP_CONTROL_SGI: /* wglSwapIntervalEXT considers an interval value of zero to mean that * vsync should be disabled, but glXSwapIntervalSGI considers such a - * value to be an error. Just silently ignore the request for now. */ - WARN("Request to disable vertical sync is not handled\n"); - gl->swap_interval = 0; - } - else - { - if (pglXSwapIntervalSGI) - ret = !pglXSwapIntervalSGI(interval); + * value to be an error. Just silently ignore the request for now. + */ + if (!interval) + WARN("Request to disable vertical sync is not handled\n"); else - WARN("GLX_SGI_swap_control extension is not available\n"); + ret = !pglXSwapIntervalSGI(interval); + break; - if (ret) - gl->swap_interval = interval; - else - SetLastError(ERROR_DC_NOT_FOUND); + case GLX_SWAP_CONTROL_NONE: + /* Unlikely to happen on modern GLX implementations */ + WARN("Request to adjust swap interval is not handled\n"); + break; } + if (ret) + gl->swap_interval = interval; + else + SetLastError(ERROR_DC_NOT_FOUND); + release_gl_drawable(gl); return ret; @@ -3111,7 +3133,13 @@ static void X11DRV_WineGL_LoadExtensions(void) register_extension("WGL_EXT_pixel_format_packed_float"); if (has_extension( WineGLInfo.glxExtensions, "GLX_EXT_swap_control")) - has_swap_control = TRUE; + { + swap_control_method = GLX_SWAP_CONTROL_EXT; + } + else if (has_extension( WineGLInfo.glxExtensions, "GLX_SGI_swap_control")) + { + swap_control_method = GLX_SWAP_CONTROL_SGI; + } /* The OpenGL extension GL_NV_vertex_array_range adds wgl/glX functions which aren't exported as 'real' wgl/glX extensions. */ if (has_extension(WineGLInfo.glExtensions, "GL_NV_vertex_array_range"))

1 0

André Hentschel : xinput1_4: Add new dll based on xinput1_3.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 0079248f109e91ef6d531e44e15b6c33674dc10e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0079248f109e91ef6d531e44e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 3 21:07:29 2013 +0200 xinput1_4: Add new dll based on xinput1_3. --- configure | 1 + configure.ac | 1 + dlls/xinput1_4/Makefile.in | 6 ++++++ dlls/xinput1_4/xinput1_4.spec | 9 +++++++++ dlls/xinput1_4/xinput1_4_main.c | 37 +++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 6 files changed, 55 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 766ffdf..56c983f 100755 --- a/configure +++ b/configure @@ -16487,6 +16487,7 @@ wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput wine_fn_config_test dlls/xinput1_3/tests xinput1_3_test +wine_fn_config_dll xinput1_4 enable_xinput1_4 wine_fn_config_dll xinput9_1_0 enable_xinput9_1_0 wine_fn_config_dll xmllite enable_xmllite wine_fn_config_test dlls/xmllite/tests xmllite_test diff --git a/configure.ac b/configure.ac index 038eec5..3a0007c 100644 --- a/configure.ac +++ b/configure.ac @@ -3169,6 +3169,7 @@ WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput]) WINE_CONFIG_TEST(dlls/xinput1_3/tests) +WINE_CONFIG_DLL(xinput1_4) WINE_CONFIG_DLL(xinput9_1_0) WINE_CONFIG_DLL(xmllite) WINE_CONFIG_TEST(dlls/xmllite/tests) diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in new file mode 100644 index 0000000..5e6b16c --- /dev/null +++ b/dlls/xinput1_4/Makefile.in @@ -0,0 +1,6 @@ +MODULE = xinput1_4.dll + +C_SRCS = \ + xinput1_4_main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec new file mode 100644 index 0000000..a911666 --- /dev/null +++ b/dlls/xinput1_4/xinput1_4.spec @@ -0,0 +1,9 @@ +1 stdcall DllMain(long long ptr) +2 stdcall XInputGetState(long ptr) xinput1_3.XInputGetState +3 stdcall XInputSetState(long ptr) xinput1_3.XInputSetState +4 stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities +5 stdcall XInputEnable(long) xinput1_3.XInputEnable +6 stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids +7 stdcall XInputGetBatteryInformation(long ptr ptr) xinput1_3.XInputGetBatteryInformation +8 stdcall XInputGetKeystroke(long long ptr) xinput1_3.XInputGetKeystroke +10 stub XInputGetAudioDeviceIds(long ptr ptr ptr ptr) diff --git a/dlls/xinput1_4/xinput1_4_main.c b/dlls/xinput1_4/xinput1_4_main.c new file mode 100644 index 0000000..f91a3c5 --- /dev/null +++ b/dlls/xinput1_4/xinput1_4_main.c @@ -0,0 +1,37 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2013 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + } + return TRUE; +} diff --git a/tools/make_specfiles b/tools/make_specfiles index c0de805..c0e6a06 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -100,6 +100,7 @@ my @dll_groups = ], [ "xinput1_3", + "xinput1_4", "xinput1_2", "xinput1_1", "xinput9_1_0",

1 0