September 2013 - Wine-Commits

Piotr Caban : msvcrt: Don't forward memcmp to ntdll.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: 4fbf246298f8cef5cb40290084c8858a1b547fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbf246298f8cef5cb4029008… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:44:56 2013 +0200 msvcrt: Don't forward memcmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 23d29a3..93c09ce 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1370,7 +1370,7 @@ @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc @ cdecl memchr(ptr long long) MSVCRT_memchr -@ cdecl memcmp(ptr ptr long) ntdll.memcmp +@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp @ cdecl memcpy(ptr ptr long) MSVCRT_memcpy @ cdecl memcpy_s(ptr long ptr long) @ cdecl memmove(ptr ptr long) ntdll.memmove diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 082029d..b6a51b6 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1594,11 +1594,19 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 #undef I10_OUTPUT_MAX_PREC /********************************************************************* + * memcmp (MSVCRT.@) + */ +int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n) +{ + return memcmp(ptr1, ptr2, n); +} + +/********************************************************************* * memcpy (MSVCRT.@) */ -void * __cdecl MSVCRT_memcpy( void *dst, const void *src, size_t n ) +void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n) { - return memmove( dst, src, n ); + return memmove(dst, src, n); } /*********************************************************************

1 0

Huw Davies : iphlpapi: Add a version of get_dns_servers for Android.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: 208eae73ae8fda6ffd34688a0f64c3456d2010ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=208eae73ae8fda6ffd34688a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 17 13:09:16 2013 +0100 iphlpapi: Add a version of get_dns_servers for Android. --- configure | 2 + configure.ac | 2 + dlls/iphlpapi/iphlpapi_main.c | 49 +++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 6 +++++ 4 files changed, 59 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a01bee0..e6f6971 100755 --- a/configure +++ b/configure @@ -13370,6 +13370,8 @@ esac ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" for ac_func in \ + __res_get_state \ + __res_getservers \ _finite \ _isnan \ _pclose \ diff --git a/configure.ac b/configure.ac index b69c379..e03928c 100644 --- a/configure.ac +++ b/configure.ac @@ -1997,6 +1997,8 @@ dnl **** Check for functions **** ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" AC_CHECK_FUNCS(\ + __res_get_state \ + __res_getservers \ _finite \ _isnan \ _pclose \ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6ce2c94..f84c700 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -978,7 +978,56 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) } return addr - servers; } +#elif defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS) + +static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) +{ + extern struct res_state *__res_get_state( void ); + extern int __res_getservers( struct res_state *, struct sockaddr_storage *, int ); + struct res_state *state = __res_get_state(); + int i, found = 0, total = __res_getservers( state, NULL, 0 ); + SOCKADDR_STORAGE *addr = servers; + struct sockaddr_storage *buf; + + if ((!servers || !num) && !ip4_only) return total; + + buf = HeapAlloc( GetProcessHeap(), 0, total * sizeof(struct sockaddr_storage) ); + total = __res_getservers( state, buf, total ); + + for (i = 0; i < total; i++) + { + if (buf[i].ss_family == AF_INET6 && ip4_only) continue; + if (buf[i].ss_family != AF_INET && buf[i].ss_family != AF_INET6) continue; + + found++; + if (!servers || !num) continue; + + if (buf[i].ss_family == AF_INET6) + { + SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)addr; + struct sockaddr_in6 *ptr = (struct sockaddr_in6 *)(buf + i); + s->sin6_family = WS_AF_INET6; + s->sin6_port = ptr->sin6_port; + s->sin6_flowinfo = ptr->sin6_flowinfo; + memcpy( &s->sin6_addr, &ptr->sin6_addr, sizeof(IN6_ADDR) ); + s->sin6_scope_id = ptr->sin6_scope_id; + memset( (char *)s + sizeof(SOCKADDR_IN6), 0, + sizeof(SOCKADDR_STORAGE) - sizeof(SOCKADDR_IN6) ); + } + else + { + *(struct sockaddr_in *)addr = *(struct sockaddr_in *)(buf + i); + memset( (char *)addr + sizeof(struct sockaddr_in), 0, + sizeof(SOCKADDR_STORAGE) - sizeof(struct sockaddr_in) ); + } + if (++addr >= servers + num) break; + } + + HeapFree( GetProcessHeap(), 0, buf ); + return found; +} #else + static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) { FIXME("Unimplemented on this system\n"); diff --git a/include/config.h.in b/include/config.h.in index 505dd28..62bee90 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1233,6 +1233,12 @@ /* Define to 1 if you have the `_vsnprintf' function. */ #undef HAVE__VSNPRINTF +/* Define to 1 if you have the `__res_getservers' function. */ +#undef HAVE___RES_GETSERVERS + +/* Define to 1 if you have the `__res_get_state' function. */ +#undef HAVE___RES_GET_STATE + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT

1 0

Bruno Jesus : ws2_32: Do not allow socket creation if WSAStartup was not called.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: 2034f515981ead985c4c24fac7b6935326cdb490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2034f515981ead985c4c24fac… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 17 10:01:07 2013 -0300 ws2_32: Do not allow socket creation if WSAStartup was not called. --- dlls/ws2_32/socket.c | 6 ++++++ dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e8d87da..8a790f3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5878,6 +5878,12 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, TRACE("af=%d type=%d protocol=%d protocol_info=%p group=%d flags=0x%x\n", af, type, protocol, lpProtocolInfo, g, dwFlags ); + if (!num_startup) + { + err = WSANOTINITIALISED; + goto done; + } + /* hack for WSADuplicateSocket */ if (lpProtocolInfo && lpProtocolInfo->dwServiceFlags4 == 0xff00ff00) { ret = lpProtocolInfo->dwServiceFlags3; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3921262..b77bb3c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -975,7 +975,6 @@ static void test_WithoutWSAStartup(void) WSASetLastError(0xdeadbeef); ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSANOTINITIALISED, "Expected 10093, received %d\n", err); WSASetLastError(0xdeadbeef);

1 0

Huw Davies : iphlpapi: Add a configure check for struct __res_state.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

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

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

Sept. 17, 2013

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

Henri Verbeet : d3d10core: Avoid LPVOID.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: 6d02c19f2be9273e17f41b51100ea29ff7b97887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d02c19f2be9273e17f41b511… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:40 2013 +0200 d3d10core: Avoid LPVOID. --- dlls/d3d10core/d3d10core_main.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index 78826f6..abc8434 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -25,14 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("fdwReason %u\n", fdwReason); - - switch(fdwReason) + switch (reason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); + DisableThreadLibraryCalls(inst); break; }

1 0

Henri Verbeet : ddraw: Verify that the surface is a render target in d3d_device_create().
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: d2d0c42b6d037fa954633a397306f557ef8bfe9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d0c42b6d037fa954633a397… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:38 2013 +0200 ddraw: Verify that the surface is a render target in d3d_device_create(). --- dlls/ddraw/device.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 66e0b7f..7510ed8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6745,6 +6745,13 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn TRACE("ddraw %p, target %p, version %u, device %p, outer_unknown %p.\n", ddraw, target, version, device, outer_unknown); + if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) + { + WARN("Surface %p is not a render target.\n", target); + return DDERR_INVALIDCAPS; + } + if (ddraw->flags & DDRAW_NO3D) { ERR_(winediag)("The application wants to create a Direct3D device, "

1 0

Henri Verbeet : ddraw: Fix render target refcount handling.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

Module: wine Branch: master Commit: df01e8d6ccd30d0278b6a999dbd984c901f150dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=df01e8d6ccd30d0278b6a999d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:36 2013 +0200 ddraw: Fix render target refcount handling. Similar to AddAttachedSurface() / DeleteAttachedSurface(), we should Release the interface version that we stored. (And actually store the interface that we AddRef.) --- dlls/ddraw/ddraw.c | 15 ++++--- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 102 +++++++++++++++++-------------------------- dlls/ddraw/surface.c | 7 ++- 4 files changed, 55 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df01e8d6ccd30d0278b6a…

1 0

André Hentschel : msvcrt/tests: Load the correct function on ARM.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

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

Jacek Caban : dxgi.idl: Added DXGI_PRESENT_* defines.
by Alexandre Julliard Sept. 17, 2013

Sept. 17, 2013

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