September 2013 - Wine-commits

André Hentschel : msvcrt/tests: Load the correct function on ARM.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 0e867236dc1208aa083e6aec6b5df9877fcd434f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e867236dc1208aa083e6aec6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 16 20:51:52 2013 +0200 msvcrt/tests: Load the correct function on ARM. --- dlls/msvcrt/tests/cpp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index fa6d4dd..92301ff 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -283,7 +283,7 @@ static BOOL InitFunctionPtrs(void) SET(ptype_info_dtor, "??1type_info@@UAA(a)XZ"); SET(ptype_info_raw_name, "?raw_name(a)type_info@@QBAPBDXZ"); SET(ptype_info_name, "?name(a)type_info@@QBEPBDXZ"); - SET(ptype_info_before, "?before(a)type_info@@QBEHABV1@@Z"); + SET(ptype_info_before, "?before(a)type_info@@QBA_NABV1@@Z"); SET(ptype_info_opequals_equals, "??8type_info@@QBA_NABV0@@Z"); SET(ptype_info_opnot_equals, "??9type_info@@QBA_NABV0@@Z"); #else

1 0

Stefan Dösinger : d3dx9_36/tests: Create*TextureFromFileInMemory doesn't fail.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 7aa17eaa5c4bd4eaad71f03ba6a0e4cedffe8eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa17eaa5c4bd4eaad71f03ba… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 17 11:39:43 2013 +0200 d3dx9_36/tests: Create*TextureFromFileInMemory doesn't fail. If the format is unsupported it picks a replacement format. Our d3dx9 cannot handle d3dx9 decompression yet, so mark the tests todo_wine in this case. --- dlls/d3dx9_36/tests/texture.c | 32 +++++++++++++------------------- 1 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index fd072c8..c168052 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -25,7 +25,7 @@ #include "d3dx9tex.h" #include "resources.h" -static int has_dxt5; +static int has_2d_dxt5, has_cube_dxt5; /* 2x2 16-bit dds, no mipmaps */ static const unsigned char dds_16bit[] = { @@ -1436,12 +1436,10 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) /* Check that D3DXCreateTextureFromFileInMemory accepts cube texture dds file (only first face texture is loaded) */ hr = D3DXCreateTextureFromFileInMemory(device, dds_cube_map, sizeof(dds_cube_map), &texture); - if (!has_dxt5 && hr == E_NOTIMPL) - { - skip("DXT5 is not supported, skipping the D3DXCreateTextureFromFileInMemory() tests\n"); - return; - } - ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (has_2d_dxt5) + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x.\n", hr, D3D_OK); + else + todo_wine ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x.\n", hr, D3D_OK); if (SUCCEEDED(hr)) { type = IDirect3DTexture9_GetType(texture); @@ -1539,12 +1537,10 @@ static void test_D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, D3DX_DEFAULT, D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); - if (!has_dxt5 && hr == E_NOTIMPL) - { - skip("DXT5 is not supported, skipping the D3DXCreateCubeTextureFromFileInMemoryEx() tests\n"); - return; - } - ok(hr == D3D_OK, "D3DXCreateCubeTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); + if (has_cube_dxt5) + ok(hr == D3D_OK, "D3DXCreateCubeTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); + else + todo_wine ok(hr == D3D_OK, "D3DXCreateCubeTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); if (SUCCEEDED(hr)) IDirect3DCubeTexture9_Release(cube_texture); } @@ -1569,11 +1565,6 @@ static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *devic ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &volume_texture); - if (!has_dxt5 && hr == E_NOTIMPL) - { - skip("DXT5 is not supported, skipping the D3DXCreateVolumeTextureFromFileInMemory() tests\n"); - return; - } ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) { @@ -1821,7 +1812,10 @@ START_TEST(texture) /* Check whether DXT5 textures are supported */ hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT5); - has_dxt5 = SUCCEEDED(hr); + has_2d_dxt5 = SUCCEEDED(hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_CUBETEXTURE, D3DFMT_DXT5); + has_cube_dxt5 = SUCCEEDED(hr); test_D3DXCheckTextureRequirements(device); test_D3DXCheckCubeTextureRequirements(device);

1 0

Jacek Caban : dxgi.idl: Added DXGI_PRESENT_* defines.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 268e2dc9002318996e11359a81d2119beaea49b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=268e2dc9002318996e11359a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 17 12:05:48 2013 +0200 dxgi.idl: Added DXGI_PRESENT_* defines. --- include/dxgi.idl | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index d87a72c..a4326a7 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -289,6 +289,16 @@ interface IDXGIAdapter : IDXGIObject ); } +cpp_quote("#define DXGI_MAX_SWAP_CHAIN_BUFFERS (16)") + +cpp_quote("#define DXGI_PRESENT_TEST __MSABI_LONG(0x00000001U)") +cpp_quote("#define DXGI_PRESENT_DO_NOT_SEQUENCE __MSABI_LONG(0x00000002U)") +cpp_quote("#define DXGI_PRESENT_RESTART __MSABI_LONG(0x00000004U)") +cpp_quote("#define DXGI_PRESENT_DO_NOT_WAIT __MSABI_LONG(0x00000008U)") +cpp_quote("#define DXGI_PRESENT_STEREO_PREFER_RIGHT __MSABI_LONG(0x00000010U)") +cpp_quote("#define DXGI_PRESENT_STEREO_TEMPORARY_MONO __MSABI_LONG(0x00000020U)") +cpp_quote("#define DXGI_PRESENT_RESTRICT_TO_OUTPUT __MSABI_LONG(0x00000040U)") + [ object, local,

1 0

Jacek Caban : d3dcommon.idl: Added WKPDID_D3DDebugObjectName declaration.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 4f1c0e93558f20ce7c9e18ff1831582c4b1299f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1c0e93558f20ce7c9e18ff1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 17 13:22:26 2013 +0200 d3dcommon.idl: Added WKPDID_D3DDebugObjectName declaration. --- include/d3dcommon.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index bc1f372..3230e80 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -635,3 +635,5 @@ typedef enum _D3D_SHADER_INPUT_TYPE D3D11_SIT_UAV_CONSUME_STRUCTURED, D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER, } D3D_SHADER_INPUT_TYPE; + +cpp_quote("DEFINE_GUID(WKPDID_D3DDebugObjectName,0x429b8c22,0x9188,0x4b0c,0x87,0x42,0xac,0xb0,0xbf,0x85,0xc2,0x00);")

1 0

Huw Davies : iphlpapi: Add a configure check for struct __res_state.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: c7dd313d750096687f8531c27e39c7de71f0092c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7dd313d750096687f8531c27… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 17 13:09:15 2013 +0100 iphlpapi: Add a configure check for struct __res_state. --- configure | 14 ++++++++++++ configure.ac | 6 +++++ dlls/iphlpapi/iphlpapi_main.c | 47 +++++++++++++++++++++++++++-------------- include/config.h.in | 3 ++ 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 28e275d..a01bee0 100755 --- a/configure +++ b/configure @@ -14792,6 +14792,20 @@ _ACEOF fi +ac_fn_c_check_type "$LINENO" "struct __res_state" "ac_cv_type_struct___res_state" "#ifdef HAVE_RESOLV_H +#include <resolv.h> +#endif +" +if test "x$ac_cv_type_struct___res_state" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT___RES_STATE 1 +_ACEOF + + +fi + + ac_fn_c_check_member "$LINENO" "struct __res_state" "_u._ext.nscount6" "ac_cv_member_struct___res_state__u__ext_nscount6" "#ifdef HAVE_RESOLV_H #include <resolv.h> #endif diff --git a/configure.ac b/configure.ac index f42fc15..b69c379 100644 --- a/configure.ac +++ b/configure.ac @@ -2344,6 +2344,12 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, #include <netinet/in.h> #endif]) +dnl Check for struct __res_state +AC_CHECK_TYPES([struct __res_state],,, +[#ifdef HAVE_RESOLV_H +#include <resolv.h> +#endif]) + dnl Check for _u._ext.nscount6 AC_CHECK_MEMBERS([struct __res_state._u._ext.nscount6],,, [#ifdef HAVE_RESOLV_H diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 789c339..6ce2c94 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -63,14 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define INADDR_NONE ~0UL #endif -/* call res_init() just once because of a bug in Mac OS X 10.4 */ -/* Call once per thread on systems that have per-thread _res. */ -static void initialise_resolver(void) -{ - if ((_res.options & RES_INIT) == 0) - res_init(); -} - /****************************************************************** * AddIPAddress (IPHLPAPI.@) * @@ -933,6 +925,15 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index return ERROR_SUCCESS; } +#ifdef HAVE_STRUCT___RES_STATE +/* call res_init() just once because of a bug in Mac OS X 10.4 */ +/* Call once per thread on systems that have per-thread _res. */ +static void initialise_resolver(void) +{ + if ((_res.options & RES_INIT) == 0) + res_init(); +} + static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) { int i, ip6_count = 0; @@ -977,6 +978,13 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) } return addr - servers; } +#else +static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) +{ + FIXME("Unimplemented on this system\n"); + return 0; +} +#endif static ULONG get_dns_server_addresses(PIP_ADAPTER_DNS_SERVER_ADDRESS address, ULONG *len) { @@ -1015,6 +1023,7 @@ static ULONG get_dns_server_addresses(PIP_ADAPTER_DNS_SERVER_ADDRESS address, UL return ERROR_SUCCESS; } +#ifdef HAVE_STRUCT___RES_STATE static BOOL is_ip_address_string(const char *str) { struct in_addr in; @@ -1023,22 +1032,28 @@ static BOOL is_ip_address_string(const char *str) ret = inet_aton(str, &in); return ret != 0; } +#endif static ULONG get_dns_suffix(WCHAR *suffix, ULONG *len) { - ULONG size, i; + ULONG size; const char *found_suffix = ""; /* Always return a NULL-terminated string, even if it's empty. */ - initialise_resolver(); - for (i = 0; !*found_suffix && i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) +#ifdef HAVE_STRUCT___RES_STATE { - /* This uses a heuristic to select a DNS suffix: - * the first, non-IP address string is selected. - */ - if (!is_ip_address_string(_res.dnsrch[i])) - found_suffix = _res.dnsrch[i]; + ULONG i; + initialise_resolver(); + for (i = 0; !*found_suffix && i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) + { + /* This uses a heuristic to select a DNS suffix: + * the first, non-IP address string is selected. + */ + if (!is_ip_address_string(_res.dnsrch[i])) + found_suffix = _res.dnsrch[i]; + } } +#endif size = MultiByteToWideChar( CP_UNIXCP, 0, found_suffix, -1, NULL, 0 ) * sizeof(WCHAR); if (!suffix || *len < size) diff --git a/include/config.h.in b/include/config.h.in index 2ab1081..505dd28 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -912,6 +912,9 @@ /* Define to 1 if the system has the type `struct xinpgen'. */ #undef HAVE_STRUCT_XINPGEN +/* Define to 1 if the system has the type `struct __res_state'. */ +#undef HAVE_STRUCT___RES_STATE + /* Define to 1 if `_u._ext.nscount6' is a member of `struct __res_state'. */ #undef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6

1 0

André Hentschel : Wine 1.7.2 freigegeben
by Jeremy Newman 17 Sep '13

17 Sep '13

Module: website Branch: master Commit: 1da07a2418a32088386cb65fe3d898b8d1699673 URL: http://source.winehq.org/git/website.git/?a=commit;h=1da07a2418a32088386cb6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 17 20:02:16 2013 +0200 Wine 1.7.2 freigegeben --- news/de/2013091301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2013091301.xml b/news/de/2013091301.xml new file mode 100644 index 0000000..6b64ada --- /dev/null +++ b/news/de/2013091301.xml @@ -0,0 +1,17 @@ +<news> +<date>13. September 2013</date> +<title>Wine 1.7.2 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserungen am bidirektionalen Textlayout.</li> + <li>NTLM und Negotiate Authentifikation für RPC über HTTP.</li> + <li>More Glyphen in der eigenen Wingdings Schrift.</li> + <li>Bessere System Tray Unterstützung im Mac Treiber.</li> + <li>Activation Context Verbesserungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.2.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

André Hentschel : More protocol relative urls in the English original
by Jeremy Newman 17 Sep '13

17 Sep '13

Module: website Branch: master Commit: 1d0e7852065d771ccc9ced4f7a0a88e3ef8801af URL: http://source.winehq.org/git/website.git/?a=commit;h=1d0e7852065d771ccc9ced… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 17 21:07:17 2013 +0200 More protocol relative urls in the English original --- templates/en/about.template | 8 +++--- templates/en/forums.template | 44 ++++++++++++++++++++-------------------- templates/en/help.template | 12 +++++----- templates/en/home.template | 4 +- templates/en/irc.template | 4 +- templates/en/license.template | 6 ++-- 6 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=1d0e7852065d771ccc…

1 0

André Hentschel : More protocol relative urls in the Turkish translation
by Jeremy Newman 17 Sep '13

17 Sep '13

Module: website Branch: master Commit: 11d860141f2ffc9024d2f1dbd405cd800aeb0239 URL: http://source.winehq.org/git/website.git/?a=commit;h=11d860141f2ffc9024d2f1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 17 21:08:48 2013 +0200 More protocol relative urls in the Turkish translation --- templates/tr/about.template | 6 ++-- templates/tr/forums.template | 44 ++++++++++++++++++++-------------------- templates/tr/help.template | 12 +++++----- templates/tr/home.template | 4 +- templates/tr/license.template | 6 ++-- 5 files changed, 36 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=11d860141f2ffc9024…

1 0

André Hentschel : More protocol relative urls in the Polish translation
by Jeremy Newman 17 Sep '13

17 Sep '13

Module: website Branch: master Commit: 6ee6a6902e6e24caa3b6865b094059c4423ec9aa URL: http://source.winehq.org/git/website.git/?a=commit;h=6ee6a6902e6e24caa3b686… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 17 21:08:51 2013 +0200 More protocol relative urls in the Polish translation --- templates/pl/about.template | 4 +- templates/pl/forums.template | 44 +++++++++++++++++++++--------------------- templates/pl/help.template | 12 +++++----- templates/pl/home.template | 4 +- 4 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=6ee6a6902e6e24caa3…

1 0

André Hentschel : More protocol relative urls in the French translation
by Jeremy Newman 17 Sep '13

17 Sep '13

Module: website Branch: master Commit: 2558702ee86c991227ab0226f00e0243e978b3a7 URL: http://source.winehq.org/git/website.git/?a=commit;h=2558702ee86c991227ab02… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 17 21:08:53 2013 +0200 More protocol relative urls in the French translation --- templates/fr/about.template | 4 +- templates/fr/forums.template | 44 +++++++++++++++++++++--------------------- templates/fr/help.template | 12 +++++----- templates/fr/home.template | 4 +- 4 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=2558702ee86c991227…

1 0