January 2013 - Wine-commits

Henri Verbeet : ddraw: Avoid LPD3DLIGHTINGELEMENT.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 09bad83c3a58a3f47bb853eeaeaeeb3ea25aff7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09bad83c3a58a3f47bb853eea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 8 09:53:16 2013 +0100 ddraw: Avoid LPD3DLIGHTINGELEMENT. --- include/d3dtypes.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dtypes.h b/include/d3dtypes.h index 59ac720..73c389f 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -597,7 +597,7 @@ typedef struct _D3DLIGHT2 { typedef struct _D3DLIGHTDATA { DWORD dwSize; - LPD3DLIGHTINGELEMENT lpIn; + D3DLIGHTINGELEMENT *lpIn; DWORD dwInSize; D3DTLVERTEX *lpOut; DWORD dwOutSize;

1 0

Henri Verbeet : ddraw: Cleanup ddraw7_QueryInterface() a bit.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 6ba9f27c16602b6410d8b146215bf2756af7e6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ba9f27c16602b6410d8b1462… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 8 09:53:17 2013 +0100 ddraw: Cleanup ddraw7_QueryInterface() a bit. --- dlls/ddraw/ddraw.c | 150 ++++++++++++++++----------------------------------- 1 files changed, 47 insertions(+), 103 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 205bf5d..e88f67e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -119,134 +119,78 @@ static inline struct ddraw *impl_from_IDirect3D7(IDirect3D7 *iface) return CONTAINING_RECORD(iface, struct ddraw, IDirect3D7_iface); } -/***************************************************************************** - * IUnknown Methods - *****************************************************************************/ - -/***************************************************************************** - * IDirectDraw7::QueryInterface - * - * Queries different interfaces of the DirectDraw object. It can return - * IDirectDraw interfaces in version 1, 2, 4 and 7, and IDirect3D interfaces - * in version 1, 2, 3 and 7. An IDirect3DDevice can be created with this - * method. - * The returned interface is AddRef()-ed before it's returned - * - * Used for version 1, 2, 4 and 7 - * - * Params: - * refiid: Interface ID asked for - * obj: Used to return the interface pointer - * - * Returns: - * S_OK if an interface was found - * E_NOINTERFACE if the requested interface wasn't found - * - *****************************************************************************/ -static HRESULT WINAPI ddraw7_QueryInterface(IDirectDraw7 *iface, REFIID refiid, void **obj) +static HRESULT WINAPI ddraw7_QueryInterface(IDirectDraw7 *iface, REFIID riid, void **out) { - struct ddraw *This = impl_from_IDirectDraw7(iface); - - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(refiid), obj); - - /* Can change surface impl type */ - wined3d_mutex_lock(); + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); - /* According to COM docs, if the QueryInterface fails, obj should be set to NULL */ - *obj = NULL; + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if(!refiid) + if (!riid) { - wined3d_mutex_unlock(); + *out = NULL; return DDERR_INVALIDPARAMS; } - /* Check DirectDraw Interfaces */ - if ( IsEqualGUID( &IID_IUnknown, refiid ) || - IsEqualGUID( &IID_IDirectDraw7, refiid ) ) + /* The refcount unit test revealed that an IDirect3D7 interface can only + * be queried from a DirectDraw object that was created as an IDirectDraw7 + * interface. The older interfaces can query any IDirect3D version except + * 7, because they are all initially created as IDirectDraw. This isn't + * really crucial behavior, and messy to implement with the common + * creation function, so it has been left out here. */ + if (IsEqualGUID(&IID_IDirectDraw7, riid) + || IsEqualGUID(&IID_IUnknown, riid)) { - *obj = &This->IDirectDraw7_iface; - TRACE("(%p) Returning IDirectDraw7 interface at %p\n", This, *obj); + *out = &ddraw->IDirectDraw7_iface; + TRACE("Returning IDirectDraw7 interface %p.\n", *out); } - else if ( IsEqualGUID( &IID_IDirectDraw4, refiid ) ) + else if (IsEqualGUID(&IID_IDirectDraw4, riid)) { - *obj = &This->IDirectDraw4_iface; - TRACE("(%p) Returning IDirectDraw4 interface at %p\n", This, *obj); + *out = &ddraw->IDirectDraw4_iface; + TRACE("Returning IDirectDraw4 interface %p.\n", *out); } - else if ( IsEqualGUID( &IID_IDirectDraw3, refiid ) ) + else if (IsEqualGUID(&IID_IDirectDraw2, riid)) { - /* This Interface exists in ddrawex.dll, it is implemented in a wrapper */ - WARN("IDirectDraw3 is not valid in ddraw.dll\n"); - *obj = NULL; - wined3d_mutex_unlock(); - return E_NOINTERFACE; + *out = &ddraw->IDirectDraw2_iface; + TRACE("Returning IDirectDraw2 interface %p.\n", *out); } - else if ( IsEqualGUID( &IID_IDirectDraw2, refiid ) ) + else if (IsEqualGUID(&IID_IDirectDraw, riid)) { - *obj = &This->IDirectDraw2_iface; - TRACE("(%p) Returning IDirectDraw2 interface at %p\n", This, *obj); + *out = &ddraw->IDirectDraw_iface; + TRACE("Returning IDirectDraw interface %p.\n", *out); } - else if ( IsEqualGUID( &IID_IDirectDraw, refiid ) ) + else if (IsEqualGUID(&IID_IDirect3D7, riid)) { - *obj = &This->IDirectDraw_iface; - TRACE("(%p) Returning IDirectDraw interface at %p\n", This, *obj); + ddraw->d3dversion = 7; + *out = &ddraw->IDirect3D7_iface; + TRACE("Returning Direct3D7 interface %p.\n", *out); } - - /* Direct3D - * The refcount unit test revealed that an IDirect3D7 interface can only be queried - * from a DirectDraw object that was created as an IDirectDraw7 interface. No idea - * who had this idea and why. The older interfaces can query and IDirect3D version - * because they are all created as IDirectDraw(1). This isn't really crucial behavior, - * and messy to implement with the common creation function, so it has been left out here. - */ - else if ( IsEqualGUID( &IID_IDirect3D , refiid ) || - IsEqualGUID( &IID_IDirect3D2 , refiid ) || - IsEqualGUID( &IID_IDirect3D3 , refiid ) || - IsEqualGUID( &IID_IDirect3D7 , refiid ) ) + else if (IsEqualGUID(&IID_IDirect3D3, riid)) { - /* Check the surface implementation */ - if (DefaultSurfaceType != WINED3D_SURFACE_TYPE_OPENGL) - { - WARN("The app requests a Direct3D interface, but non-opengl surfaces where set in winecfg\n"); - /* Do not abort here, only reject 3D Device creation */ - } - - if ( IsEqualGUID( &IID_IDirect3D , refiid ) ) - { - This->d3dversion = 1; - *obj = &This->IDirect3D_iface; - TRACE(" returning Direct3D interface at %p.\n", *obj); - } - else if ( IsEqualGUID( &IID_IDirect3D2 , refiid ) ) - { - This->d3dversion = 2; - *obj = &This->IDirect3D2_iface; - TRACE(" returning Direct3D2 interface at %p.\n", *obj); - } - else if ( IsEqualGUID( &IID_IDirect3D3 , refiid ) ) - { - This->d3dversion = 3; - *obj = &This->IDirect3D3_iface; - TRACE(" returning Direct3D3 interface at %p.\n", *obj); - } - else if(IsEqualGUID( &IID_IDirect3D7 , refiid )) - { - This->d3dversion = 7; - *obj = &This->IDirect3D7_iface; - TRACE(" returning Direct3D7 interface at %p.\n", *obj); - } + ddraw->d3dversion = 3; + *out = &ddraw->IDirect3D3_iface; + TRACE("Returning Direct3D3 interface %p.\n", *out); + } + else if (IsEqualGUID(&IID_IDirect3D2, riid)) + { + ddraw->d3dversion = 2; + *out = &ddraw->IDirect3D2_iface; + TRACE("Returning Direct3D2 interface %p.\n", *out); + } + else if (IsEqualGUID(&IID_IDirect3D, riid)) + { + ddraw->d3dversion = 1; + *out = &ddraw->IDirect3D_iface; + TRACE("Returning Direct3D interface %p.\n", *out); } /* Unknown interface */ else { - ERR("(%p)->(%s, %p): No interface found\n", This, debugstr_guid(refiid), obj); - wined3d_mutex_unlock(); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *out = NULL; return E_NOINTERFACE; } - IUnknown_AddRef( (IUnknown *) *obj ); - wined3d_mutex_unlock(); - + IUnknown_AddRef((IUnknown *)*out); return S_OK; }

1 0

Henri Verbeet : d3d8/tests: Merge d3d8_main.c into device.c.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 9dbf059c75ab5724c5e1aa3dabf88ffffdc213d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbf059c75ab5724c5e1aa3da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 8 09:53:18 2013 +0100 d3d8/tests: Merge d3d8_main.c into device.c. --- dlls/d3d8/tests/Makefile.in | 1 - dlls/d3d8/tests/d3d8_main.c | 119 ------------------------------------------- dlls/d3d8/tests/device.c | 95 ++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9dbf059c75ab5724c5e1a…

1 0

Henri Verbeet : d3d8/tests: Merge volume.c into device.c.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 00ef7a52850126fcf83066078c2766706e44c947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ef7a52850126fcf83066078… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 8 09:53:19 2013 +0100 d3d8/tests: Merge volume.c into device.c. --- dlls/d3d8/tests/Makefile.in | 3 +- dlls/d3d8/tests/device.c | 89 +++++++++++++++++++++++++ dlls/d3d8/tests/volume.c | 154 ------------------------------------------- 3 files changed, 90 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00ef7a52850126fcf8306…

1 0

Ken Thomases : winemac: Implement CreateDesktopWindow().
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: bbb8c60c7effcf1a1bab3256bf7b718dc082e0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb8c60c7effcf1a1bab3256b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 7 14:43:21 2013 -0600 winemac: Implement CreateDesktopWindow(). --- dlls/winemac.drv/Makefile.in | 3 +- dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 9 ++++- dlls/winemac.drv/window.c | 73 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 5 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 08a5440..2082b37 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -5,7 +5,8 @@ EXTRALIBS = -framework AppKit C_SRCS = \ display.c \ gdi.c \ - macdrv_main.c + macdrv_main.c \ + window.c OBJC_SRCS = \ cocoa_display.m diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 176b588..333cb0c 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -99,7 +99,7 @@ static DWORD get_dpi(void) * * Returns the rectangle encompassing all the screens. */ -static CGRect macdrv_get_desktop_rect(void) +CGRect macdrv_get_desktop_rect(void) { CGRect ret; CGDirectDisplayID displayIDs[32]; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 6b52ff1..2382809 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -3,7 +3,7 @@ * * Copyright 1996 Alexandre Julliard * Copyright 1999 Patrik Stridvall - * Copyright 2011, 2012 Ken Thomases for CodeWeavers Inc. + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -63,4 +63,11 @@ static inline const char *wine_dbgstr_cgrect(CGRect cgrect) } +/************************************************************************** + * Mac GDI driver + */ + +extern CGRect macdrv_get_desktop_rect(void) DECLSPEC_HIDDEN; + + #endif /* __WINE_MACDRV_H */ diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c new file mode 100644 index 0000000..a374742 --- /dev/null +++ b/dlls/winemac.drv/window.c @@ -0,0 +1,73 @@ +/* + * MACDRV windowing driver + * + * Copyright 1993, 1994, 1995, 1996, 2001 Alexandre Julliard + * Copyright 1993 David Metcalfe + * Copyright 1995, 1996 Alex Korobka + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. + * + * 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 "macdrv.h" +#include "winuser.h" +#include "wine/server.h" + +WINE_DEFAULT_DEBUG_CHANNEL(macdrv); + + +/********************************************************************** + * CreateDesktopWindow (MACDRV.@) + */ +BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd) +{ + unsigned int width, height; + + TRACE("%p\n", hwnd); + + /* retrieve the real size of the desktop */ + SERVER_START_REQ(get_window_rectangles) + { + req->handle = wine_server_user_handle(hwnd); + req->relative = COORDS_CLIENT; + wine_server_call(req); + width = reply->window.right; + height = reply->window.bottom; + } + SERVER_END_REQ; + + if (!width && !height) /* not initialized yet */ + { + CGRect rect = macdrv_get_desktop_rect(); + + SERVER_START_REQ(set_window_pos) + { + req->handle = wine_server_user_handle(hwnd); + req->previous = 0; + req->swp_flags = SWP_NOZORDER; + req->window.left = CGRectGetMinX(rect); + req->window.top = CGRectGetMinY(rect); + req->window.right = CGRectGetMaxX(rect); + req->window.bottom = CGRectGetMaxY(rect); + req->client = req->window; + wine_server_call(req); + } + SERVER_END_REQ; + } + + return TRUE; +} diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 03fa490..7bea2e8c 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -4,5 +4,6 @@ # USER driver +@ cdecl CreateDesktopWindow(long) macdrv_CreateDesktopWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo

1 0

Ken Thomases : libwine: Call the Mac Multi-Processing Services lib from the main thread first.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 573436047e93aa911d1ec2a943127df31e61b0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=573436047e93aa911d1ec2a94… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 7 14:43:31 2013 -0600 libwine: Call the Mac Multi-Processing Services lib from the main thread first. --- libs/wine/Makefile.in | 2 +- libs/wine/loader.c | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index ca93d26..a86e73b 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,7 +1,7 @@ DLLFLAGS = @DLLFLAGS@ MODULE = libwine.$(LIBEXT) VERSCRIPT = $(srcdir)/wine.map -EXTRALIBS = $(LIBPORT) @LIBDL@ @CRTLIBS@ @COREFOUNDATIONLIB@ +EXTRALIBS = $(LIBPORT) @LIBDL@ @CRTLIBS@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@ DEFS = -D__WINESRC__ -DWINE_UNICODE_API="" VERSION = 1.0 diff --git a/libs/wine/loader.c b/libs/wine/loader.c index df0a6b5..9681381 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -39,21 +39,26 @@ # include <unistd.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wine/library.h" - #ifdef __APPLE__ #include <crt_externs.h> #define environ (*_NSGetEnviron()) #include <CoreFoundation/CoreFoundation.h> +#define LoadResource MacLoadResource +#define GetCurrentThread MacGetCurrentThread +#include <CoreServices/CoreServices.h> +#undef LoadResource +#undef GetCurrentThread #include <pthread.h> #else extern char **environ; #endif +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "windef.h" +#include "winbase.h" +#include "wine/library.h" + /* argc/argv for the Windows application */ int __wine_main_argc = 0; char **__wine_main_argv = NULL; @@ -756,6 +761,11 @@ static void apple_main_thread( void (*init_func)(void) ) CFRunLoopSourceContext source_context = { 0 }; CFRunLoopSourceRef source; + /* Multi-processing Services can get confused about the main thread if the + * first time it's used is on a secondary thread. Use it here to make sure + * that doesn't happen. */ + MPTaskIsPreemptive(MPCurrentTaskID()); + /* Give ourselves the best chance of having the distributed notification * center scheduled on this thread's run loop. In theory, it's scheduled * in the first thread to ask for it. */

1 0

Ken Thomases : loader: On Mac, embed Info.plist in (__TEXT, __info_plist) section.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: c40a72223c9f13aa18d0d5cf7a8071618da6599e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40a72223c9f13aa18d0d5cf7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 7 14:44:23 2013 -0600 loader: On Mac, embed Info.plist in (__TEXT, __info_plist) section. --- .gitignore | 1 + configure | 4 ++-- configure.ac | 4 ++-- loader/Makefile.in | 7 +++++-- loader/wine_info.plist.in | 26 ++++++++++++++++++++++++++ tools/make_makefiles | 1 + 6 files changed, 37 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b565fab..f990f3e 100644 --- a/.gitignore +++ b/.gitignore @@ -274,6 +274,7 @@ loader/wine-installed loader/wine-preloader loader/wine64 loader/wine64-preloader +loader/wine_info.plist msg.pot po/*.mo programs/Makeprog.rules diff --git a/configure b/configure index ca5da34..5e62766 100755 --- a/configure +++ b/configure @@ -6567,10 +6567,10 @@ fi case $host_os in darwin11*) - LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000" + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" ;; *) - LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000" + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" ;; esac if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" diff --git a/configure.ac b/configure.ac index c06e108..372bc06 100644 --- a/configure.ac +++ b/configure.ac @@ -732,9 +732,9 @@ case $host_os in AC_SUBST(CORESERVICESLIB,"-framework CoreServices") case $host_os in darwin11*) - AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) ;; + AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist"]) ;; *) - AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) ;; + AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist"]) ;; esac if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then diff --git a/loader/Makefile.in b/loader/Makefile.in index ecc20ab..3993fa3 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -39,12 +39,15 @@ LDEXECFLAGS = @LDEXECFLAGS@ wine-preloader wine64-preloader: preloader.o Makefile.in $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o $(LIBPORT) $(LDFLAGS) -$(MAIN_BINARY): main.o Makefile.in +$(MAIN_BINARY): main.o Makefile.in wine_info.plist $(CC) -o $@ $(LDEXECFLAGS) main.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in +wine-installed: main.o Makefile.in wine_info.plist $(CC) -o $@ $(LDEXECFLAGS) main.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_INSTALL) +wine_info.plist: wine_info.plist.in + LC_ALL=C sed -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' $< >$@ || ($(RM) $@ && false) + $(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy f=`expr $@ : '__install__$.*$'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f diff --git a/loader/wine_info.plist.in b/loader/wine_info.plist.in new file mode 100644 index 0000000..aea99e5 --- /dev/null +++ b/loader/wine_info.plist.in @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>wine</string> + <key>CFBundleIdentifier</key> + <string>org.winehq.wine</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>Wine</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>@PACKAGE_VERSION@</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleVersion</key> + <string>@PACKAGE_VERSION@</string> + <key>NSPrincipalClass</key> + <string>WineApplication</string> +</dict> +</plist> diff --git a/tools/make_makefiles b/tools/make_makefiles index df798d7..be106c9 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -95,6 +95,7 @@ my @ignores = ( "*/*/tests/testlist.c", "include/config.h", "include/stamp-h", + "loader/wine_info.plist", "msg.pot", "po/*.mo", "programs/winetest/build.nfo",

1 0

Alexandre Julliard : configure: Cope with sys/un.h requiring sys/socket.h.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: a58ae36aed6dbb064fec757649d53f0615721012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58ae36aed6dbb064fec75764… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 13:13:34 2013 +0100 configure: Cope with sys/un.h requiring sys/socket.h. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 5e62766..a1caaa4 100755 --- a/configure +++ b/configure @@ -5935,7 +5935,6 @@ for ac_header in \ sys/timeout.h \ sys/times.h \ sys/uio.h \ - sys/un.h \ sys/utsname.h \ sys/vm86.h \ sys/wait.h \ @@ -6036,6 +6035,7 @@ for ac_header in \ netinet/ip_var.h \ netinet/udp.h \ netipx/ipx.h \ + sys/un.h \ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 372bc06..d14a2df 100644 --- a/configure.ac +++ b/configure.ac @@ -522,7 +522,6 @@ AC_CHECK_HEADERS(\ sys/timeout.h \ sys/times.h \ sys/uio.h \ - sys/un.h \ sys/utsname.h \ sys/vm86.h \ sys/wait.h \ @@ -559,6 +558,7 @@ AC_CHECK_HEADERS(\ netinet/ip_var.h \ netinet/udp.h \ netipx/ipx.h \ + sys/un.h \ ,,,[#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h>

1 0

Alexandre Julliard : configure: Allow pthread_create to be in the C library .
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 02aa14518b30fb3289f1e1c46349f1d18ea6cafc URL: http://source.winehq.org/git/wine.git/?a=commit;h=02aa14518b30fb3289f1e1c46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 13:14:11 2013 +0100 configure: Allow pthread_create to be in the C library. --- configure | 10 ++++++++-- configure.ac | 5 +++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/configure b/configure index a1caaa4..6dc5b50 100755 --- a/configure +++ b/configure @@ -7255,7 +7255,11 @@ fi if test "$ac_cv_header_pthread_h" = "yes" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 + ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create" +if test "x$ac_cv_func_pthread_create" = xyes; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 $as_echo_n "checking for pthread_create in -lpthread... " >&6; } if ${ac_cv_lib_pthread_pthread_create+:} false; then : $as_echo_n "(cached) " >&6 @@ -7297,7 +7301,9 @@ if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : fi fi -if test "x$LIBPTHREAD" = "x"; then : + +fi +if test "x$ac_cv_func_pthread_create" != xyes -a "x$LIBPTHREAD" = x; then : case "x$with_pthread" in xno) ;; *) as_fn_error $? "pthread ${notice_platform}development files not found. diff --git a/configure.ac b/configure.ac index d14a2df..4b0c360 100644 --- a/configure.ac +++ b/configure.ac @@ -954,9 +954,10 @@ dnl **** Check for pthread **** if test "$ac_cv_header_pthread_h" = "yes" then - AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(LIBPTHREAD,"-lpthread")]) + AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(LIBPTHREAD,"-lpthread")])]) fi -WINE_ERROR_WITH(pthread,[test "x$LIBPTHREAD" = "x"],[pthread ${notice_platform}development files not found. +WINE_ERROR_WITH(pthread,[test "x$ac_cv_func_pthread_create" != xyes -a "x$LIBPTHREAD" = x], +[pthread ${notice_platform}development files not found. Wine cannot support threads without libpthread.]) dnl **** Check for X11 ****

1 0

Alexandre Julliard : winedbg: Use an if instead of a switch in case some float types have the same size.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: e2761ab075da960c1b52f10e91f1e87b58d3c253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2761ab075da960c1b52f10e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 13:28:05 2013 +0100 winedbg: Use an if instead of a switch in case some float types have the same size. --- programs/winedbg/be_arm.c | 11 +++++------ programs/winedbg/be_i386.c | 12 +++++------- programs/winedbg/be_x86_64.c | 12 +++++------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 520cb06..00b6f5c 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1875,12 +1875,11 @@ static int be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, */ if (!memory_read_value(lvalue, size, tmp)) return FALSE; - switch (size) - { - case sizeof(float): *ret = *(float*)tmp; break; - case sizeof(double): *ret = *(double*)tmp; break; - default: return FALSE; - } + if (size == sizeof(float)) *ret = *(float*)tmp; + else if (size == sizeof(double)) *ret = *(double*)tmp; + else if (size == sizeof(long double)) *ret = *(long double*)tmp; + else return FALSE; + return TRUE; } diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 5dc00ed..a20d732 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -767,13 +767,11 @@ static int be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, if (!memory_read_value(lvalue, size, tmp)) return FALSE; /* float & double types have to be promoted to a long double */ - switch (size) - { - case sizeof(float): *ret = *(float*)tmp; break; - case sizeof(double): *ret = *(double*)tmp; break; - case sizeof(long double): *ret = *(long double*)tmp; break; - default: return FALSE; - } + if (size == sizeof(float)) *ret = *(float*)tmp; + else if (size == sizeof(double)) *ret = *(double*)tmp; + else if (size == sizeof(long double)) *ret = *(long double*)tmp; + else return FALSE; + return TRUE; } diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 7fae50c..b97db3a 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -631,13 +631,11 @@ static int be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, if (!memory_read_value(lvalue, size, tmp)) return FALSE; /* float & double types have to be promoted to a long double */ - switch (size) - { - case sizeof(float): *ret = *(float*)tmp; break; - case sizeof(double): *ret = *(double*)tmp; break; - case sizeof(long double): *ret = *(long double*)tmp; break; - default: return FALSE; - } + if (size == sizeof(float)) *ret = *(float*)tmp; + else if (size == sizeof(double)) *ret = *(double*)tmp; + else if (size == sizeof(long double)) *ret = *(long double*)tmp; + else return FALSE; + return TRUE; }

1 0