wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Frédéric Delanoy : dnsapi/tests: Constify a character string.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: ad906531b22aedebb41bb50466cc39834d461d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad906531b22aedebb41bb5046… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 21 14:32:22 2013 +0100 dnsapi/tests: Constify a character string. --- dlls/dnsapi/tests/name.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index 2872c35..fba6955 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -154,22 +154,22 @@ static void test_DnsValidateName_A( void ) static void test_DnsNameCompare_A( void ) { - static CHAR empty[] = "", - dot[] = ".", - dotdot[] = "..", - A[] = "A", - a[] = "a", - B[] = "B", - b[] = "b", - A_dot_B[] = "A.B", - a_dot_a[] = "a.a", - a_dot_b[] = "a.b", - a_dot_b_dot[] = "a.b.", - a_dot_b_dotdot[] = "a.b..", - B_dot_A[] = "B.A", - b_dot_a[] = "b.a", - b_dot_a_dot[] = "b.a.", - b_dot_a_dotdot[] = "b.a.."; + static const CHAR empty[] = "", + dot[] = ".", + dotdot[] = "..", + A[] = "A", + a[] = "a", + B[] = "B", + b[] = "b", + A_dot_B[] = "A.B", + a_dot_a[] = "a.a", + a_dot_b[] = "a.b", + a_dot_b_dot[] = "a.b.", + a_dot_b_dotdot[] = "a.b..", + B_dot_A[] = "B.A", + b_dot_a[] = "b.a", + b_dot_a_dot[] = "b.a.", + b_dot_a_dotdot[] = "b.a.."; ok( DnsNameCompare_A( NULL, NULL ) == TRUE, "failed unexpectedly\n" );

1 0

Frédéric Delanoy : crypt32/tests: Constify some character strings.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 90d1e9471bcada654b6c19393da749305675f62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d1e9471bcada654b6c19393… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 21 14:32:21 2013 +0100 crypt32/tests: Constify some character strings. --- dlls/crypt32/tests/cert.c | 2 +- dlls/crypt32/tests/encode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index a117332..bd67c18 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -351,7 +351,7 @@ static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, dwSizeWithNull,size); } -static CHAR cspNameA[] = "WineCryptTemp"; +static const CHAR cspNameA[] = "WineCryptTemp"; static WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e','m','p',0 }; static const BYTE v1CertWithPubKey[] = { 0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 61d5c72..ad38fd5 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -6911,7 +6911,7 @@ static void test_decodeCMSSignerInfo(DWORD dwEncoding) LPBYTE buf = NULL; DWORD size = 0; CMSG_CMS_SIGNER_INFO *info; - static char oid1[] = "1.2.3", oid2[] = "1.5.6"; + static const char oid1[] = "1.2.3", oid2[] = "1.5.6"; /* A CMS signer can't be decoded without a serial number. */ SetLastError(0xdeadbeef);

1 0

Frédéric Delanoy : comcat/tests: Constify some character strings.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 4ef6d4a6add74d231ea3a9fe35fb96a5991cabeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef6d4a6add74d231ea3a9fe3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 21 14:32:20 2013 +0100 comcat/tests: Constify some character strings. --- dlls/comcat/tests/comcat.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index f78e234..ff5b51a 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -65,15 +65,15 @@ static void do_enum(void) GUID the_cat[1]; GUID wanted_guid; ULONG fetched = -1; - - static WCHAR szCatID[] = { + + static const WCHAR szCatID[] = { '{', 'd','e','a','d','c','a','f','e', '-','0','0','0','0','-','0','0','0','0', '-','0','0','0','0', '-','0','0','0','0','0','0','0','0','0','0','0','0', '}',0}; - static WCHAR szGuid[] = { + static const WCHAR szGuid[] = { '{', 'd','e','a','d','c','a','f','e','-', 'b','e','e','d','-',

1 0

Alexandre Julliard : winebuild: Fix path separator for Cygwin.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: c2d0907923ccbe1611f630fdefdf1f8a18840b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d0907923ccbe1611f630fde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 21 20:49:16 2013 +0100 winebuild: Fix path separator for Cygwin. --- tools/winebuild/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index f665e31..566911f 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -39,7 +39,7 @@ #include "build.h" -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) # define PATH_SEPARATOR ';' #else # define PATH_SEPARATOR ':'

1 0

Alexandre Julliard : msvcp100: Implement _Locinfo::_Getname.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 91356c3bedccc379c6457a83a7895050f1ce5b1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91356c3bedccc379c6457a83a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 21 17:57:46 2013 +0100 msvcp100: Implement _Locinfo::_Getname. --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp90/locale.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 92c99d7..12463af 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -908,8 +908,8 @@ @ cdecl -arch=win64 ?_Getlconv@_Locinfo@std@@QEBAPEBUlconv@@XZ(ptr) _Locinfo__Getlconv @ thiscall -arch=win32 ?_Getmonths@_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getmonths @ cdecl -arch=win64 ?_Getmonths@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getmonths -@ stub -arch=win32 ?_Getname@_Locinfo@std@@QBEPBDXZ -@ stub -arch=win64 ?_Getname@_Locinfo@std@@QEBAPEBDXZ +@ thiscall -arch=win32 ?_Getname@_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getname +@ cdecl -arch=win64 ?_Getname@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getname @ cdecl -arch=arm ?_Getpfirst@_Container_base12@std@@QBAPAPAU_Iterator_base12@2@XZ(ptr) _Container_base12__Getpfirst @ thiscall -arch=i386 ?_Getpfirst@_Container_base12@std@@QBEPAPAU_Iterator_base12@2@XZ(ptr) _Container_base12__Getpfirst @ cdecl -arch=win64 ?_Getpfirst@_Container_base12@std@@QEBAPEAPEAU_Iterator_base12@2@XZ(ptr) _Container_base12__Getpfirst diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 3d9871c..d31f301 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1331,8 +1331,8 @@ @ thiscall -arch=i386 ?_Getmonths@_Locinfo@std@@QBEPBDXZ(ptr) msvcp90.?_Getmonths@_Locinfo@std@@QBEPBDXZ @ cdecl -arch=win64 ?_Getmonths@_Locinfo@std@@QEBAPEBDXZ(ptr) msvcp90.?_Getmonths@_Locinfo@std@@QEBAPEBDXZ @ stub -arch=arm ?_Getname@_Locinfo@std@@QBAPBDXZ -@ stub -arch=i386 ?_Getname@_Locinfo@std@@QBEPBDXZ -@ stub -arch=win64 ?_Getname@_Locinfo@std@@QEBAPEBDXZ +@ thiscall -arch=win32 ?_Getname@_Locinfo@std@@QBEPBDXZ(ptr) msvcp100.?_Getname@_Locinfo@std@@QBEPBDXZ +@ cdecl -arch=win64 ?_Getname@_Locinfo@std@@QEBAPEBDXZ(ptr) msvcp100.?_Getname@_Locinfo@std@@QEBAPEBDXZ @ cdecl -arch=arm ?_Getpfirst@_Container_base12@std@@QBAPAPAU_Iterator_base12@2@XZ(ptr) msvcp100.?_Getpfirst@_Container_base12@std@@QBAPAPAU_Iterator_base12@2@XZ @ thiscall -arch=i386 ?_Getpfirst@_Container_base12@std@@QBEPAPAU_Iterator_base12@2@XZ(ptr) msvcp100.?_Getpfirst@_Container_base12@std@@QBEPAPAU_Iterator_base12@2@XZ @ cdecl -arch=win64 ?_Getpfirst@_Container_base12@std@@QEBAPEAPEAU_Iterator_base12@2@XZ(ptr) msvcp100.?_Getpfirst@_Container_base12@std@@QEBAPEAPEAU_Iterator_base12@2@XZ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5fdf890..08cc893 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9454,6 +9454,16 @@ basic_string_char* __thiscall locale_name(const locale *this, basic_string_char return ret; } +#else + +/* ?_Getname@_Locinfo@std@@QBEPBDXZ */ +/* ?_Getname@_Locinfo@std@@QEBAPEBDXZ */ +DEFINE_THISCALL_WRAPPER(_Locinfo__Getname, 4) +const char * __thiscall _Locinfo__Getname( const _Locinfo *this ) +{ + return locale_string_char_c_str( &this->newlocname ); +} + #endif /* _MSVCP_VER < 100 */ /* wctrans */

1 0

Alexandre Julliard : msvcp90: Work around Mingw duplicate encode/ decode_pointer definition.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 6e47b1691b9d5b0d118d0f98a8c71f2487948725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e47b1691b9d5b0d118d0f98a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 21 12:43:03 2013 +0100 msvcp90: Work around Mingw duplicate encode/decode_pointer definition. --- dlls/msvcp90/msvcp_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 496efa9..848d5bb 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -122,3 +122,8 @@ __int64 * __cdecl std_Fpz_func(void) { return &std_Fpz; } + +#if defined(__MINGW32__) && _MSVCP_VER >= 80 && _MSVCP_VER <= 90 +/* Hack: prevent Mingw from importing mingw_helpers.o which conflicts with encode/decode_pointer */ +int mingw_app_type = 0; +#endif

1 0

Alexandre Julliard : msvcp90: Avoid mismatched parentheses inside ifdefs.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: b6e5496da44a46971f45ec38eb979239a5bb58cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6e5496da44a46971f45ec38e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 20:35:05 2013 +0100 msvcp90: Avoid mismatched parentheses inside ifdefs. --- dlls/msvcp90/locale.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f2edf04..5fdf890 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9536,11 +9536,12 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_char__Do_widen_s) VTABLE_ADD_FUNC(ctype_char_do_narrow) VTABLE_ADD_FUNC(ctype_char_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_char__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_char__Do_narrow_s) #else VTABLE_ADD_FUNC(ctype_char_do_narrow) - VTABLE_ADD_FUNC(ctype_char_do_narrow_ch)); + VTABLE_ADD_FUNC(ctype_char_do_narrow_ch) #endif + ); __ASM_VTABLE(ctype_wchar, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -9557,11 +9558,12 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s) #else VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) #endif + ); __ASM_VTABLE(ctype_short, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -9578,11 +9580,12 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s) #else VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) #endif + ); __ASM_VTABLE(codecvt_base, VTABLE_ADD_FUNC(codecvt_base_vector_dtor) VTABLE_ADD_FUNC(codecvt_base_do_always_noconv)

1 0

Alexandre Julliard : Wine release 1.7.9
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: website Branch: master Commit: 5c2216ce2e7f1706bcec8e3140a1f11a72864044 URL: http://source.winehq.org/git/website.git/?a=commit;h=5c2216ce2e7f1706bcec8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 19:42:24 2013 +0100 Wine release 1.7.9 --- news/en/2013122001.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013122001.xml b/news/en/2013122001.xml new file mode 100644 index 0000000..0fe38da --- /dev/null +++ b/news/en/2013122001.xml @@ -0,0 +1,15 @@ +<news> +<date>December 20, 2013</date> +<title>Wine 1.7.9 Released</title> +<body> + The Wine development release 1.7.9 is now available. + <a href="{$root}/announce/1.7.9">What's new</a> in this release: +<ul> + <li>Improved window moving/resizing in the Mac driver.</li> + <li>Some DirectDraw palette fixes.</li> + <li>Reduced code duplication between C++ runtime versions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.9.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.9 : Alexandre Julliard : Release 1.7.9
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: refs/tags/wine-1.7.9 Tag: 73f7b89403f473ead1a2873af2303517f66b61cc URL: http://source.winehq.org/git/wine.git/?a=tag;h=73f7b89403f473ead1a2873af230… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 19:34:52 2013 +0100 Release 1.7.9

1 0

Alexandre Julliard : Release 1.7.9.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 12f43584739fd4df5ca86a320bd9fd09fe3b64b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f43584739fd4df5ca86a320… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 19:34:52 2013 +0100 Release 1.7.9. --- ANNOUNCE | 558 ++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 267 insertions(+), 312 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12f43584739fd4df5ca86…

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2013