July 2012 - Wine-commits - list.winehq.org

Ken Thomases : secur32: On Mac, define modern ECDH cipher suites if the SDK doesn't.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 98652ec1c6536d0cee00b99a592f0531285cd053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98652ec1c6536d0cee00b99a5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jul 13 15:19:38 2012 -0500 secur32: On Mac, define modern ECDH cipher suites if the SDK doesn't. --- dlls/secur32/schannel_macosx.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index d4576b9..75fe9a0 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -45,6 +45,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); #ifdef HAVE_SECURITY_SECURITY_H +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 +/* Defined in <Security/CipherSuite.h> in the 10.6 SDK or later. */ +enum { + TLS_ECDH_ECDSA_WITH_NULL_SHA = 0xC001, + TLS_ECDH_ECDSA_WITH_RC4_128_SHA = 0xC002, + TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA = 0xC003, + TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA = 0xC004, + TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA = 0xC005, + TLS_ECDHE_ECDSA_WITH_NULL_SHA = 0xC006, + TLS_ECDHE_ECDSA_WITH_RC4_128_SHA = 0xC007, + TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA = 0xC008, + TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA = 0xC009, + TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA = 0xC00A, + TLS_ECDH_RSA_WITH_NULL_SHA = 0xC00B, + TLS_ECDH_RSA_WITH_RC4_128_SHA = 0xC00C, + TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA = 0xC00D, + TLS_ECDH_RSA_WITH_AES_128_CBC_SHA = 0xC00E, + TLS_ECDH_RSA_WITH_AES_256_CBC_SHA = 0xC00F, + TLS_ECDHE_RSA_WITH_NULL_SHA = 0xC010, + TLS_ECDHE_RSA_WITH_RC4_128_SHA = 0xC011, + TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA = 0xC012, + TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA = 0xC013, + TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA = 0xC014, + TLS_ECDH_anon_WITH_NULL_SHA = 0xC015, + TLS_ECDH_anon_WITH_RC4_128_SHA = 0xC016, + TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA = 0xC017, + TLS_ECDH_anon_WITH_AES_128_CBC_SHA = 0xC018, + TLS_ECDH_anon_WITH_AES_256_CBC_SHA = 0xC019, +}; +#endif + struct mac_session { SSLContextRef context; struct schan_transport *transport; @@ -156,7 +187,6 @@ static const struct cipher_suite cipher_suites[] = { CIPHER_SUITE(TLS, DHE_RSA, AES_256_CBC, SHA), CIPHER_SUITE(TLS, DH_anon, AES_256_CBC, SHA), -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 CIPHER_SUITE(TLS, ECDH_ECDSA, NULL, SHA), CIPHER_SUITE(TLS, ECDH_ECDSA, RC4_128, SHA), CIPHER_SUITE(TLS, ECDH_ECDSA, 3DES_EDE_CBC, SHA), @@ -182,7 +212,6 @@ static const struct cipher_suite cipher_suites[] = { CIPHER_SUITE(TLS, ECDH_anon, 3DES_EDE_CBC, SHA), CIPHER_SUITE(TLS, ECDH_anon, AES_128_CBC, SHA), CIPHER_SUITE(TLS, ECDH_anon, AES_256_CBC, SHA), -#endif CIPHER_SUITE(SSL, RSA, RC2_CBC, MD5), CIPHER_SUITE(SSL, RSA, IDEA_CBC, MD5),

1 0

Henri Verbeet : ddraw: Create surfaces with the correct mip level in device_parent_create_texture_surface ().
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 89a781adc984ce43a26b1d61f666f59d73599dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a781adc984ce43a26b1d61f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 15 15:44:57 2012 +0200 ddraw: Create surfaces with the correct mip level in device_parent_create_texture_surface(). --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 2a44d1f..1963de2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5348,7 +5348,7 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ } /* FIXME: Validate that format, usage, pool, etc. really make sense. */ - if (FAILED(hr = ddraw_create_surface(ddraw, &desc, &ddraw_surface, 0, tex_root->version))) + if (FAILED(hr = ddraw_create_surface(ddraw, &desc, &ddraw_surface, level, tex_root->version))) return hr; done:

1 0

Henri Verbeet : wined3d: Get rid of the unused sampler_stages limit.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: adf66a338f3cd777ce51dee4e436e88471b7991b URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf66a338f3cd777ce51dee4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 15 15:44:58 2012 +0200 wined3d: Get rid of the unused sampler_stages limit. --- dlls/wined3d/directx.c | 6 ------ dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b0c2d38..542d857 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2405,7 +2405,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->limits.fragment_samplers = 1; gl_info->limits.vertex_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; - gl_info->limits.sampler_stages = 1; gl_info->limits.vertex_attribs = 16; gl_info->limits.glsl_vs_float_constants = 0; gl_info->limits.glsl_ps_float_constants = 0; @@ -2761,11 +2760,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->limits.texture_stages = fragment_caps.MaxTextureBlendStages; TRACE("Max texture stages: %u.\n", gl_info->limits.texture_stages); - /* In some cases the number of texture stages can be larger than the number - * of samplers. The GF4 for example can use only 2 samplers (no fragment - * shaders), but 8 texture stages (register combiners). */ - gl_info->limits.sampler_stages = max(gl_info->limits.fragment_samplers, gl_info->limits.texture_stages); - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) { gl_info->fbo_ops.glIsRenderbuffer = gl_info->glIsRenderbuffer; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a5b2c55..17d371f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1479,7 +1479,6 @@ struct wined3d_gl_limits UINT vertex_samplers; UINT combined_samplers; UINT general_combiners; - UINT sampler_stages; UINT clipplanes; UINT texture_size; UINT texture3d_size;

1 0

Henri Verbeet : winex11: Properly calculate the virtual screen rect in xinerama_init().
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: ed331cb0a5f3bee1b2075b877d3c2a19a668f9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed331cb0a5f3bee1b2075b877… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 15 15:44:59 2012 +0200 winex11: Properly calculate the virtual screen rect in xinerama_init(). --- dlls/winex11.drv/xinerama.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index b2014ed..84db8ba 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -177,6 +177,7 @@ void xinerama_init( unsigned int width, unsigned int height ) } primary = get_primary(); + SetRectEmpty( &virtual_screen_rect ); /* coordinates (0,0) have to point to the primary monitor origin */ OffsetRect( &rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); @@ -184,17 +185,17 @@ void xinerama_init( unsigned int width, unsigned int height ) { OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); + UnionRect( &virtual_screen_rect, &virtual_screen_rect, &monitors[i].rcMonitor ); TRACE( "monitor %p: %s work %s%s\n", index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), wine_dbgstr_rect(&monitors[i].rcWork), (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } - virtual_screen_rect = rect; screen_width = primary->rcMonitor.right - primary->rcMonitor.left; screen_height = primary->rcMonitor.bottom - primary->rcMonitor.top; TRACE( "virtual size: %s primary size: %dx%d\n", - wine_dbgstr_rect(&rect), screen_width, screen_height ); + wine_dbgstr_rect(&virtual_screen_rect), screen_width, screen_height ); wine_tsx11_unlock(); }

1 0

Henri Verbeet : winex11: Add support for XRandR 1.2.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: cf6f8d2eb50aa28829ee2b76c61aab411f8730ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6f8d2eb50aa28829ee2b76c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 15 15:45:00 2012 +0200 winex11: Add support for XRandR 1.2. --- configure | 16 +++ configure.ac | 7 +- dlls/winex11.drv/xrandr.c | 237 +++++++++++++++++++++++++++++++++++++++++---- include/config.h.in | 3 + 4 files changed, 244 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf6f8d2eb50aa28829ee2…

1 0

Henri Verbeet : winex11: Add support for XRandR 1.3.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 2b4a7912ec00e1c69e98ccb1d2e810d8df572027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4a7912ec00e1c69e98ccb1d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 15 15:45:01 2012 +0200 winex11: Add support for XRandR 1.3. --- dlls/winex11.drv/xrandr.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e2dbff3..de29423 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -53,8 +53,8 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) -MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRSetCrtcConfig) +static typeof(XRRGetScreenResources) *xrandr_get_screen_resources; static RRMode *xrandr12_modes; #endif @@ -96,7 +96,6 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources) LOAD_FUNCPTR(XRRGetCrtcInfo) LOAD_FUNCPTR(XRRGetOutputInfo) - LOAD_FUNCPTR(XRRGetScreenResources) LOAD_FUNCPTR(XRRSetCrtcConfig) r = 2; #endif @@ -273,7 +272,7 @@ static int xrandr12_get_current_mode(void) int i, ret = -1; wine_tsx11_lock(); - if (!(resources = pXRRGetScreenResources( gdi_display, root_window ))) + if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) { wine_tsx11_unlock(); ERR("Failed to get screen resources.\n"); @@ -322,7 +321,7 @@ static LONG xrandr12_set_current_mode( int mode ) mode = mode % xrandr_mode_count; wine_tsx11_lock(); - if (!(resources = pXRRGetScreenResources( gdi_display, root_window ))) + if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) { wine_tsx11_unlock(); ERR("Failed to get screen resources.\n"); @@ -364,7 +363,7 @@ static void xrandr12_init_modes(void) XRRCrtcInfo *crtc_info; int i, j; - if (!(resources = pXRRGetScreenResources( gdi_display, root_window ))) + if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); return; @@ -459,6 +458,14 @@ void X11DRV_XRandR_Init(void) #ifdef HAVE_XRRGETSCREENRESOURCES if (ret >= 2 && (major > 1 || (major == 1 && minor >= 2))) + { + if (major > 1 || (major == 1 && minor >= 3)) + xrandr_get_screen_resources = wine_dlsym( xrandr_handle, "XRRGetScreenResourcesCurrent", NULL, 0 ); + if (!xrandr_get_screen_resources) + xrandr_get_screen_resources = wine_dlsym( xrandr_handle, "XRRGetScreenResources", NULL, 0 ); + } + + if (xrandr_get_screen_resources) xrandr12_init_modes(); else #endif

1 0

Alexandre Julliard : wined3d: Remove unused variables.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 30e0e3ffff998397ba8fb45f6b6e99ac58e92de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e0e3ffff998397ba8fb45f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 14:26:32 2012 +0200 wined3d: Remove unused variables. --- dlls/wined3d/surface.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f5cc3f5..21028ba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2553,7 +2553,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P struct wined3d_format format; UINT update_w, update_h; UINT dst_w, dst_h; - UINT src_w, src_h; RECT r, dst_rect; UINT src_pitch; POINT p; @@ -2598,9 +2597,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P return WINED3DERR_INVALIDCALL; } - src_w = src_surface->resource.width; - src_h = src_surface->resource.height; - dst_w = dst_surface->resource.width; dst_h = dst_surface->resource.height;

1 0

Alexandre Julliard : gdiplus: Avoid out of bounds access warning.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 9ff2bbc3c8bdcb2113af9012b2ba0b7521c79ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff2bbc3c8bdcb2113af9012b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 14:28:31 2012 +0200 gdiplus: Avoid out of bounds access warning. --- dlls/gdiplus/tests/image.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 750b084..1f5ace1 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3317,6 +3317,7 @@ static void test_tiff_palette(void) ColorPalette pal; ARGB entry[256]; } palette; + ARGB *entries = palette.pal.Entries; /* 1bpp TIFF without palette */ image = load_image((const BYTE *)&TIFF_data, sizeof(TIFF_data)); @@ -3346,8 +3347,8 @@ todo_wine expect(2, palette.pal.Count); if (palette.pal.Count == 2) { - ok(palette.pal.Entries[0] == 0xff000000, "expected 0xff000000, got %#x\n", palette.pal.Entries[0]); - ok(palette.pal.Entries[1] == 0xffffffff, "expected 0xffffffff, got %#x\n", palette.pal.Entries[1]); + ok(entries[0] == 0xff000000, "expected 0xff000000, got %#x\n", entries[0]); + ok(entries[1] == 0xffffffff, "expected 0xffffffff, got %#x\n", entries[1]); } GdipDisposeImage(image);

1 0

André Hentschel : winebuild: Generate relay debugging thunks for ARM.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 83b60a7b0d592850c4d6b5cf3a43e71dd5cbdba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b60a7b0d592850c4d6b5cf3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 15 16:41:56 2012 +0200 winebuild: Generate relay debugging thunks for ARM. --- tools/winebuild/spec32.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 3dff304..7892f22 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -83,7 +83,7 @@ int has_relays( DLLSPEC *spec ) { int i; - if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64) return 0; + if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64 && target_cpu != CPU_ARM) return 0; for (i = spec->base; i <= spec->limit; i++) { @@ -210,6 +210,34 @@ static void output_relay_debug( DLLSPEC *spec ) } break; + case CPU_ARM: + switch (args) + { + default: output( "\tpush {r0-r3}\n" ); break; + case 3: output( "\tpush {r0-r2}\n" ); break; + case 2: output( "\tpush {r0-r1}\n" ); break; + case 1: output( "\tpush {r0}\n" ); break; + case 0: break; + } + output( "\tpush {LR}\n" ); + output( "\tmov r2, SP\n"); + if (odp->flags & FLAG_RET64) flags |= 1; + output( "\tmov r1, #%u\n", (flags << 24) ); + if (args) output( "\tadd r1, #%u\n", (args << 16) ); + if ((i - spec->base) & 0xf000) output( "\tadd r1, #%u\n", (i - spec->base) & 0xf000 ); + if ((i - spec->base) & 0x0f00) output( "\tadd r1, #%u\n", (i - spec->base) & 0x0f00 ); + if ((i - spec->base) & 0x00f0) output( "\tadd r1, #%u\n", (i - spec->base) & 0x00f0 ); + if ((i - spec->base) & 0x000f) output( "\tadd r1, #%u\n", (i - spec->base) & 0x000f ); + output( "\tldr r0, [PC, #0]\n"); + output( "\tmov PC, PC\n"); + output( "\t.long .L__wine_spec_relay_descr\n" ); + output( "\tldr r3, [r0, #4]\n"); + output( "\tblx r3\n"); + output( "\tpop {r3}\n" ); + if (args) output( "\tadd SP, SP, #%u\n", min(args*4, 16) ); + output( "\tbx r3\n"); + break; + case CPU_x86_64: output( "\tsubq $40,%%rsp\n" ); output_cfi( ".cfi_adjust_cfa_offset 40" );

1 0

André Hentschel : ntdll: Add support for relay debugging on ARM.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 1ceec8c78982d7ef5124e86a8da53166473e1f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ceec8c78982d7ef5124e86a8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 15 16:45:01 2012 +0200 ntdll: Add support for relay debugging on ARM. --- dlls/ntdll/relay.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 3588f1c..b3c4aea 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) WINE_DECLARE_DEBUG_CHANNEL(timestamp); @@ -355,6 +355,37 @@ __ASM_GLOBAL_FUNC( call_entry_point, __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) +#elif defined(__arm__) +__ASM_GLOBAL_FUNC( call_entry_point, + "push {r4, r5, LR}\n\t" + "mov r4, r0\n\t" + "mov r5, SP\n\t" + "lsl r3, r1, #2\n\t" + "cmp r3, #0\n\t" + "beq 5f\n\t" + "sub SP, SP, r3\n\t" + "bic SP, SP, #15\n\t" + "1:\tsub r3, r3, #4\n\t" + "ldr r0, [r2, r3]\n\t" + "str r0, [SP, r3]\n\t" + "cmp r3, #0\n\t" + "bgt 1b\n\t" + "cmp r1, #1\n\t" + "bgt 2f\n\t" + "pop {r0}\n\t" + "b 5f\n\t" + "2:\tcmp r1, #2\n\t" + "bgt 3f\n\t" + "pop {r0-r1}\n\t" + "b 5f\n\t" + "3:\tcmp r1, #3\n\t" + "bgt 4f\n\t" + "pop {r0-r2}\n\t" + "b 5f\n\t" + "4:\tpop {r0-r3}\n\t" + "5:\tblx r4\n\t" + "mov SP, r5\n\t" + "pop {r4, r5, PC}" ) #else __ASM_GLOBAL_FUNC( call_entry_point, "pushq %rbp\n\t"

1 0