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

Ken Thomases : gdi32: Link against AppKit on the Mac to avoid later crash in the Mac driver.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 1f2d55637399b6d2507b661d013c0bbf8a9c0d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2d55637399b6d2507b661d0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Aug 4 22:53:44 2013 -0500 gdi32: Link against AppKit on the Mac to avoid later crash in the Mac driver. --- configure | 3 +++ configure.ac | 1 + dlls/gdi32/Makefile.in | 2 +- 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 7c9c76c..0cdfd36 100755 --- a/configure +++ b/configure @@ -697,6 +697,7 @@ COREAUDIO SECURITYLIB DISKARBITRATIONLIB LDEXECFLAGS +APPKITLIB CORESERVICESLIB APPLICATIONSERVICESLIB FORCEFEEDBACKLIB @@ -6686,6 +6687,8 @@ clean:: CORESERVICESLIB="-framework CoreServices" + APPKITLIB="-framework AppKit" + case $host_os in darwin11*) 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" diff --git a/configure.ac b/configure.ac index 0e3df61..ca3d038 100644 --- a/configure.ac +++ b/configure.ac @@ -734,6 +734,7 @@ clean:: AC_SUBST(FORCEFEEDBACKLIB,"-framework ForceFeedback -framework CoreFoundation") AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices") AC_SUBST(CORESERVICESLIB,"-framework CoreServices") + AC_SUBST(APPKITLIB,"-framework AppKit") 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,-sectcreate,__TEXT,__info_plist,wine_info.plist"]) ;; diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index f4661da..c7953a9 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -3,7 +3,7 @@ MODULE = gdi32.dll IMPORTLIB = gdi32 IMPORTS = advapi32 EXTRAINCL = @FREETYPE_CFLAGS@ @FONTCONFIGINCL@ -EXTRALIBS = @CARBONLIB@ +EXTRALIBS = @CARBONLIB@ @APPKITLIB@ DELAYIMPORTS = usp10 C_SRCS = \

1 0

Andrew Eikum : oleaut32: 64-bit typelib fixes.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: cc29cad2cc925f03fe220c2b40ca8d1d6bd53261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc29cad2cc925f03fe220c2b4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 12 15:24:14 2013 -0500 oleaut32: 64-bit typelib fixes. --- dlls/oleaut32/typelib.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d8e9840..031f2b1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2537,10 +2537,18 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( ptiRet->lcid=pLibInfo->set_lcid; /* FIXME: correct? */ ptiRet->lpstrSchema=NULL; /* reserved */ ptiRet->cbSizeInstance=tiBase.size; +#ifdef _WIN64 + if(pLibInfo->syskind == SYS_WIN32) + ptiRet->cbSizeInstance=sizeof(void*); +#endif ptiRet->typekind=tiBase.typekind & 0xF; ptiRet->cFuncs=LOWORD(tiBase.cElement); ptiRet->cVars=HIWORD(tiBase.cElement); ptiRet->cbAlignment=(tiBase.typekind >> 11 )& 0x1F; /* there are more flags there */ +#ifdef _WIN64 + if(pLibInfo->syskind == SYS_WIN32) + ptiRet->cbAlignment = 8; +#endif ptiRet->wTypeFlags=tiBase.flags; ptiRet->wMajorVerNum=LOWORD(tiBase.version); ptiRet->wMinorVerNum=HIWORD(tiBase.version); @@ -8484,7 +8492,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface, case TKIND_INTERFACE: case TKIND_DISPATCH: case TKIND_COCLASS: - info->cbSizeInstance = 4; + info->cbSizeInstance = This->ptr_size; break; case TKIND_RECORD: case TKIND_UNION: @@ -10199,6 +10207,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc(ICreateTypeInfo2 *iface, !funcDesc->cParams) return TYPE_E_INCONSISTENTPROPFUNCS; +#ifdef _WIN64 + if(This->pTypeLib->syskind == SYS_WIN64 && + funcDesc->oVft % 8 != 0) + return E_INVALIDARG; +#endif + memset(&tmp_func_desc, 0, sizeof(tmp_func_desc)); TLBFuncDesc_Constructor(&tmp_func_desc);

1 0

Jacek Caban : winetest: Added www.winehq.org snapshot for test purposes.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: tools Branch: master Commit: 8571ee72bee49901d9e2dcf5e1c7adc89ea196ce URL: http://source.winehq.org/git/tools.git/?a=commit;h=8571ee72bee49901d9e2dcf5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 13 14:26:34 2013 +0200 winetest: Added www.winehq.org snapshot for test purposes. --- winetest/tests/winehq_snapshot/index.html | 322 +++++++++++++++++++ winetest/tests/winehq_snapshot/index_files/brand | 109 +++++++ .../winehq_snapshot/index_files/cw_logo_sm.png | Bin 0 -> 4383 bytes winetest/tests/winehq_snapshot/index_files/ga.js | 64 ++++ .../winehq_snapshot/index_files/images/bg.jpg | Bin 0 -> 86167 bytes .../index_files/images/home_icons.png | Bin 0 -> 21418 bytes .../winehq_snapshot/index_files/images/tab_h.png | Bin 0 -> 584 bytes .../winehq_snapshot/index_files/images/tab_s.png | Bin 0 -> 614 bytes .../winehq_snapshot/index_files/images/tab_u.png | Bin 0 -> 616 bytes .../tests/winehq_snapshot/index_files/jquery.js | 32 ++ .../tests/winehq_snapshot/index_files/styles.css | 324 ++++++++++++++++++++ .../tests/winehq_snapshot/index_files/utils.js | 21 ++ .../index_files/winehq_logo_glass.png | Bin 0 -> 36271 bytes .../index_files/winehq_logo_text.png | Bin 0 -> 6870 bytes 14 files changed, 872 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=8571ee72bee49901d9e2…

1 0

Jacek Caban : winetest: Removed Google Analytics from winehq snapshot.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: tools Branch: master Commit: 5876c8015253399ceac2defb8b705d88b102426d URL: http://source.winehq.org/git/tools.git/?a=commit;h=5876c8015253399ceac2defb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 13 14:27:05 2013 +0200 winetest: Removed Google Analytics from winehq snapshot. --- winetest/tests/winehq_snapshot/index.html | 18 +----- winetest/tests/winehq_snapshot/index_files/ga.js | 64 ---------------------- 2 files changed, 3 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=5876c8015253399ceac2…

1 0

Jacek Caban : winegecko.php: Added 2.24-beta1 release.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: tools Branch: master Commit: d25c77748e4b7b41205c42b5082f9ac9f82f3531 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d25c77748e4b7b41205c42b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 14 14:38:04 2013 +0200 winegecko.php: Added 2.24-beta1 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 963966f..5120880 100644 --- a/winegecko.php +++ b/winegecko.php @@ -76,7 +76,9 @@ $aFileSizes = array( '2.21-beta1-x86'=>20875264, '2.21-beta1-x86_64'=>21648896, '2.21-x86'=>20871680, - '2.21-x86_64'=>21646336 + '2.21-x86_64'=>21646336, + '2.24-beta1-x86'=>22354944, + '2.24-beta1-x86_64'=>23590400 ); // Exact size of the file:

1 0

Frédéric Delanoy : winedev: FAQ is maintained on the wiki.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: docs Branch: master Commit: bf349af149b62204e03a00049e4495ac584fa5a3 URL: http://source.winehq.org/git/docs.git/?a=commit;h=bf349af149b62204e03a00049… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 17:22:41 2013 +0200 winedev: FAQ is maintained on the wiki. --- en/winedev-documentation.sgml | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index 1ac0400..da2347c 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -59,10 +59,6 @@ developers using Winelib to port Win32 applications to Unix. </para></listitem> - <listitem><para> - The <emphasis>Wine FAQ</emphasis>. This book contains frequently asked questions - about Wine with their answers. - </para></listitem> </itemizedlist> </para>

1 0

Frédéric Delanoy : winedev: 'doc-html' make target doesn't exist anymore.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: docs Branch: master Commit: ba4be23d7ee7729e7c5355392b43c736565fc118 URL: http://source.winehq.org/git/docs.git/?a=commit;h=ba4be23d7ee7729e7c5355392… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 17:22:38 2013 +0200 winedev: 'doc-html' make target doesn't exist anymore. --- en/winedev-documentation.sgml | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index 9f30b87..3ca0060 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -574,11 +574,12 @@ <para> You can also generate HTML output for the API documentation, in this case the - make command is <command>make doc-html</command> in the dll directory, - or <command>make htmlpages</command> from the root. The output will be + make command is <command>make htmlpages</command> in the dll directory, + or from the root. The output will be placed by default under <filename>documentation/html</filename>. Similarly - you can create SGML source code to produce the <emphasis>Wine Api Guide</emphasis> - with the command <command>make sgmlpages</command>. + you can create SGML/XML Docbook source code to produce the <emphasis>Wine API + Guide</emphasis> with the command <command>make sgmlpages</command>/<command>make + xmlpages</command> respectively. </para> </sect2> </sect1>

1 0

Frédéric Delanoy : winedev: Wine Packager' s Guide is no more.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: docs Branch: master Commit: 4741a6c29726ca7eadd234b81705128ee59ea7d1 URL: http://source.winehq.org/git/docs.git/?a=commit;h=4741a6c29726ca7eadd234b81… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 17:22:40 2013 +0200 winedev: Wine Packager's Guide is no more. --- en/winedev-documentation.sgml | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index 3ca0060..1ac0400 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -60,13 +60,6 @@ </para></listitem> <listitem><para> - The <emphasis>Wine Packager's Guide</emphasis>. This book contains - information for anyone who will be distributing Wine to end users - in a prepackaged format. It is also the exception to the rule as - it has intentionally been kept in text format. - </para></listitem> - - <listitem><para> The <emphasis>Wine FAQ</emphasis>. This book contains frequently asked questions about Wine with their answers. </para></listitem>

1 0

Frédéric Delanoy : winelib: Assorted formatting & tagging fixes.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: docs Branch: master Commit: b4fc598786041af46fc60b79223d012485bc1758 URL: http://source.winehq.org/git/docs.git/?a=commit;h=b4fc598786041af46fc60b792… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 2 21:54:59 2013 +0200 winelib: Assorted formatting & tagging fixes. --- en/winelib-bindlls.sgml | 85 ++++++++++++---------- en/winelib-intro.sgml | 107 +++++++++++++++-------------- en/winelib-mfc.sgml | 13 ++-- en/winelib-porting.sgml | 24 +++--- en/winelib-toolkit.sgml | 176 ++++++++++++++++++++++++----------------------- 5 files changed, 211 insertions(+), 194 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=b4fc598786041af46fc60…

1 0

Frédéric Delanoy : winedev: configure. ac is used instead of configure.in.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: docs Branch: master Commit: 411ba3448ba50eab1c85dc2c6e10b8800698752d URL: http://source.winehq.org/git/docs.git/?a=commit;h=411ba3448ba50eab1c85dc2c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 17:22:37 2013 +0200 winedev: configure.ac is used instead of configure.in. --- en/winedev-coding.sgml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index 69f2479..b5eb660 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -309,7 +309,7 @@ code <para> This first step is to make <command>autoconf</command> check - for this header. In <filename>configure.in</filename> you + for this header. In <filename>configure.ac</filename> you add a segment like this in the section that checks for header files (search for "header files"): </para> @@ -363,7 +363,7 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H)) function. To solve this problem you would add <function>memmove</function> to the list of functions that <command>autoconf</command> checks for. In - <filename>configure.in</filename> you search for + <filename>configure.ac</filename> you search for <function>AC_CHECK_FUNCS</function> and add <function>memmove</function> (you will notice that someone already did this for this particular function).

1 0