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

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXMatrixStackImpl_QueryInterface ().
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 4522b07c86eafe334a249221a18e4bd0271db029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4522b07c86eafe334a249221a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 9 20:43:41 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXMatrixStackImpl_QueryInterface(). --- dlls/d3dx9_36/math.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index b9271e0..10a6cb9 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -801,17 +801,21 @@ static inline ID3DXMatrixStackImpl *impl_from_ID3DXMatrixStack(ID3DXMatrixStack return CONTAINING_RECORD(iface, ID3DXMatrixStackImpl, ID3DXMatrixStack_iface); } -static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *iface, REFIID riid, void **ppobj) +static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *iface, REFIID riid, void **out) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); - if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXMatrixStack)) + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID3DXMatrixStack) + || IsEqualGUID(riid, &IID_IUnknown)) { - ID3DXMatrixStack_AddRef(iface); - *ppobj = This; - return S_OK; + ID3DXMatrixStack_AddRef(iface); + *out = iface; + return S_OK; } - *ppobj = NULL; - WARN("(%p)->(%s,%p), not found\n", This, debugstr_guid(riid), ppobj); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXLineImpl_QueryInterface().
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 1718a6cf1c557264f9cf7a886c401540fe003a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1718a6cf1c557264f9cf7a886… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 9 20:43:42 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXLineImpl_QueryInterface(). --- dlls/d3dx9_36/line.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 2a9d6e9..d9ec2e0 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -40,15 +40,13 @@ static inline ID3DXLineImpl *impl_from_ID3DXLine(ID3DXLine *iface) /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXLineImpl_QueryInterface(ID3DXLine* iface, REFIID riid, LPVOID* object) { - ID3DXLineImpl *This = impl_from_ID3DXLine(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXLine)) { ID3DXLine_AddRef(iface); - *object = This; + *object = iface; return S_OK; }

1 0

Austin English : ntdll: Give a better error message if signal context functions aren't defined.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 132da2c4281c48525f8976555627761758c12bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=132da2c4281c48525f8976555… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 9 14:04:23 2012 -0500 ntdll: Give a better error message if signal context functions aren't defined. --- dlls/ntdll/signal_i386.c | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 6763344..3b07e77 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -100,7 +100,7 @@ typedef struct * signal context platform-specific definitions */ -#ifdef linux +#if defined (__linux__) typedef ucontext_t SIGCONTEXT; @@ -178,9 +178,7 @@ __ASM_GLOBAL_FUNC(vm86_enter, # define __HAVE_VM86 #endif -#endif /* linux */ - -#ifdef BSDI +#elif defined (__BSDI__) #include <machine/frame.h> typedef struct trapframe SIGCONTEXT; @@ -206,9 +204,7 @@ typedef struct trapframe SIGCONTEXT; #define FPU_sig(context) NULL /* FIXME */ #define FPUX_sig(context) NULL /* FIXME */ -#endif /* bsdi */ - -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include <machine/trap.h> @@ -239,9 +235,7 @@ typedef struct sigcontext SIGCONTEXT; #define FPU_sig(context) NULL /* FIXME */ #define FPUX_sig(context) NULL /* FIXME */ -#endif /* __FreeBSD__ */ - -#ifdef __OpenBSD__ +#elif defined (__OpenBSD__) typedef struct sigcontext SIGCONTEXT; @@ -273,9 +267,7 @@ typedef struct sigcontext SIGCONTEXT; #define T_MCHK T_MACHK #define T_XMMFLT T_XFTRAP -#endif /* __OpenBSD__ */ - -#if defined(__svr4__) || defined(_SCO_DS) || defined(__sun) +#elif defined(__svr4__) || defined(_SCO_DS) || defined(__sun) #ifdef _SCO_DS #include <sys/regset.h> @@ -323,9 +315,7 @@ typedef struct ucontext SIGCONTEXT; #define FPU_sig(context) NULL /* FIXME */ #define FPUX_sig(context) NULL /* FIXME */ -#endif /* svr4 || SCO_DS */ - -#ifdef __APPLE__ +#elif defined (__APPLE__) # include <sys/ucontext.h> typedef ucontext_t SIGCONTEXT; @@ -375,9 +365,7 @@ typedef ucontext_t SIGCONTEXT; #define FPUX_sig(context) ((XMM_SAVE_AREA32 *)&(context)->uc_mcontext->fs.fpu_fcw) #endif -#endif /* __APPLE__ */ - -#if defined(__NetBSD__) +#elif defined(__NetBSD__) # include <sys/ucontext.h> # include <sys/types.h> # include <signal.h> @@ -411,7 +399,9 @@ typedef ucontext_t SIGCONTEXT; #define T_MCHK T_MCA #define T_XMMFLT T_XMM -#endif /* __NetBSD__ */ +#else +#error You must define the signal context functions for your platform +#endif /* linux */ WINE_DEFAULT_DEBUG_CHANNEL(seh);

1 0

Erich Hoover : ws2_32: Implement IP_UNICAST_IF socket option.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 313d36d5aa03db464a752eca58df87b628ca80bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=313d36d5aa03db464a752eca5… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Apr 9 13:06:08 2012 -0600 ws2_32: Implement IP_UNICAST_IF socket option. --- dlls/ws2_32/socket.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 228d101..5d20459 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -383,6 +383,9 @@ static const int ws_ip_map[][2] = #ifdef IP_PKTINFO MAP_OPTION( IP_PKTINFO ), #endif +#ifdef IP_UNICAST_IF + MAP_OPTION( IP_UNICAST_IF ), +#endif }; static const int ws_ipv6_map[][2] = @@ -2846,6 +2849,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, #endif case WS_IP_TOS: case WS_IP_TTL: +#ifdef IP_UNICAST_IF + case WS_IP_UNICAST_IF: +#endif if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); @@ -4268,6 +4274,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, #endif case WS_IP_TOS: case WS_IP_TTL: +#ifdef IP_UNICAST_IF + case WS_IP_UNICAST_IF: +#endif convert_sockopt(&level, &optname); break; case WS_IP_DONTFRAGMENT:

1 0

Erich Hoover : ws2_32: Implement IPV6_UNICAST_IF socket option.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 1d49c6692991bbbd102102a508b2409e5e5f5f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d49c6692991bbbd102102a50… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Apr 9 13:06:30 2012 -0600 ws2_32: Implement IPV6_UNICAST_IF socket option. --- dlls/ws2_32/socket.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5d20459..fd384a5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -401,6 +401,9 @@ static const int ws_ipv6_map[][2] = MAP_OPTION( IPV6_MULTICAST_LOOP ), MAP_OPTION( IPV6_UNICAST_HOPS ), MAP_OPTION( IPV6_V6ONLY ), +#ifdef IPV6_UNICAST_IF + MAP_OPTION( IPV6_UNICAST_IF ), +#endif }; static const int ws_af_map[][2] = @@ -2884,6 +2887,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: case WS_IPV6_V6ONLY: +#ifdef IPV6_UNICAST_IF + case WS_IPV6_UNICAST_IF: +#endif if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); @@ -4302,6 +4308,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: case WS_IPV6_V6ONLY: +#ifdef IPV6_UNICAST_IF + case WS_IPV6_UNICAST_IF: +#endif convert_sockopt(&level, &optname); break; case WS_IPV6_DONTFRAG:

1 0

Alexandre Julliard : gdi32/tests: Automatically reset the bits after comparing the hash.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 514e952827477dab0b494752512909fc4ad7f8ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=514e952827477dab0b4947525… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 9 21:28:50 2012 +0200 gdi32/tests: Automatically reset the bits after comparing the hash. --- dlls/gdi32/tests/dib.c | 67 +++--------------------------------------------- 1 files changed, 4 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=514e952827477dab0b494…

1 0

Alexandre Julliard : gdi32/tests: Add tests for DC bounds to the DIB graphics tests.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 399ab6f1f26c81ab4a7ff8069ed904435033a2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=399ab6f1f26c81ab4a7ff8069… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 9 22:59:11 2012 +0200 gdi32/tests: Add tests for DC bounds to the DIB graphics tests. --- dlls/gdi32/tests/dib.c | 383 +++++++++++++++++++++++++++++++----------------- 1 files changed, 249 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=399ab6f1f26c81ab4a7ff…

1 0

Alexandre Julliard : gdi32/tests: Add tests for DC bounds on various device types.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: a186a8b170d5f6976148d30307202bb7c62c7070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a186a8b170d5f6976148d3030… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 13:20:01 2012 +0200 gdi32/tests: Add tests for DC bounds on various device types. --- dlls/gdi32/tests/dc.c | 61 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 48 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index da2c31b..52f0fba 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -345,7 +345,7 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) unsigned int i; WORD ramp[3][256]; BOOL ret; - RECT clip; + RECT rect; UINT type; if (GetObjectType( hdc ) == OBJ_METADC) @@ -360,8 +360,15 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); - type = GetClipBox( hdc, &clip ); + type = GetClipBox( hdc, &rect ); ok( type == ERROR, "GetClipBox returned %d on %s\n", type, descr ); + + SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); + SetMapMode( hdc, MM_TEXT ); + Rectangle( hdc, 2, 2, 5, 5 ); + type = GetBoundsRect( hdc, &rect, DCB_RESET ); + todo_wine + ok( !type, "GetBoundsRect succeeded on %s\n", descr ); } else { @@ -375,16 +382,35 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); - type = GetClipBox( hdc, &clip ); + type = GetClipBox( hdc, &rect ); ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); + + SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); + SetMapMode( hdc, MM_TEXT ); + Rectangle( hdc, 2, 2, 4, 4 ); + type = GetBoundsRect( hdc, &rect, DCB_RESET ); + todo_wine + ok( rect.left == 2 && rect.top == 2 && rect.right == 4 && rect.bottom == 4 && type == DCB_SET, + "GetBoundsRect returned %d,%d,%d,%d type %x on memdc for %s\n", + rect.left, rect.top, rect.right, rect.bottom, type, descr ); } - type = GetClipBox( ref_dc, &clip ); + type = GetClipBox( ref_dc, &rect ); ok( type == SIMPLEREGION, "GetClipBox returned %d on %s\n", type, descr ); - ok( clip.left == 0 && clip.top == 0 && - clip.right == GetDeviceCaps( ref_dc, DESKTOPHORZRES ) && - clip.bottom == GetDeviceCaps( ref_dc, DESKTOPVERTRES ), - "GetClipBox returned %d,%d,%d,%d on %s\n", clip.left, clip.top, clip.right, clip.bottom, descr ); + ok( rect.left == 0 && rect.top == 0 && + rect.right == GetDeviceCaps( ref_dc, DESKTOPHORZRES ) && + rect.bottom == GetDeviceCaps( ref_dc, DESKTOPVERTRES ), + "GetClipBox returned %d,%d,%d,%d on %s\n", rect.left, rect.top, rect.right, rect.bottom, descr ); + + SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_ACCUMULATE ); + SetMapMode( ref_dc, MM_TEXT ); + Rectangle( ref_dc, 3, 3, 5, 5 ); + type = GetBoundsRect( ref_dc, &rect, DCB_RESET ); + /* it may or may not work on non-memory DCs */ + ok( (rect.left == 0 && rect.top == 0 && rect.right == 0 && rect.bottom == 0 && type == DCB_RESET) || + (rect.left == 3 && rect.top == 3 && rect.right == 5 && rect.bottom == 5 && type == DCB_SET), + "GetBoundsRect returned %d,%d,%d,%d type %x on %s\n", + rect.left, rect.top, rect.right, rect.bottom, type, descr ); if (GetObjectType( hdc ) == OBJ_MEMDC) { @@ -413,11 +439,20 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); - type = GetClipBox( hdc, &clip ); + type = GetClipBox( hdc, &rect ); ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); - ok( clip.left == 0 && clip.top == 0 && clip.right == 16 && clip.bottom == 16, + ok( rect.left == 0 && rect.top == 0 && rect.right == 16 && rect.bottom == 16, "GetClipBox returned %d,%d,%d,%d on memdc for %s\n", - clip.left, clip.top, clip.right, clip.bottom, descr ); + rect.left, rect.top, rect.right, rect.bottom, descr ); + + SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); + SetMapMode( hdc, MM_TEXT ); + Rectangle( hdc, 5, 5, 12, 14 ); + type = GetBoundsRect( hdc, &rect, DCB_RESET ); + todo_wine + ok( rect.left == 5 && rect.top == 5 && rect.right == 12 && rect.bottom == 14 && type == DCB_SET, + "GetBoundsRect returned %d,%d,%d,%d type %x on memdc for %s\n", + rect.left, rect.top, rect.right, rect.bottom, type, descr ); SelectObject( hdc, old ); DeleteObject( dib ); @@ -1022,13 +1057,13 @@ static void test_printer_dc(void) ret = GetDeviceCaps( display_memdc, TECHNOLOGY ); ok( ret == DT_RASDISPLAY, "wrong type %u\n", ret ); - test_device_caps( memdc, hdc, "printer dc" ); - bmp = CreateBitmap( 100, 100, 1, GetDeviceCaps( hdc, BITSPIXEL ), NULL ); orig = SelectObject( memdc, bmp ); ok( orig != NULL, "SelectObject failed\n" ); ok( BitBlt( hdc, 10, 10, 20, 20, memdc, 0, 0, SRCCOPY ), "BitBlt failed\n" ); + test_device_caps( memdc, hdc, "printer dc" ); + ok( !SelectObject( display_memdc, bmp ), "SelectObject succeeded\n" ); SelectObject( memdc, orig ); DeleteObject( bmp );

1 0

Alexandre Julliard : gdi32/tests: Add tests for DC bounds handling across various DC manipulations.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 80f68d4442b59cfa4260edf2c9d776a954ae2138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f68d4442b59cfa4260edf2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 13:30:32 2012 +0200 gdi32/tests: Add tests for DC bounds handling across various DC manipulations. --- dlls/gdi32/tests/dc.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 112 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 52f0fba..e2ec28c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -736,15 +736,18 @@ todo_wine static void test_boundsrect(void) { + char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *info = (BITMAPINFO *)buffer; HDC hdc; - HBITMAP bitmap; + HBITMAP bitmap, dib, old; RECT rect, expect, set_rect; UINT ret; + int level; hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); bitmap = CreateCompatibleBitmap( hdc, 200, 200 ); - SelectObject( hdc, bitmap ); + old = SelectObject( hdc, bitmap ); ret = GetBoundsRect(hdc, NULL, 0); ok(ret == 0, "Expected GetBoundsRect to return 0, got %u\n", ret); @@ -874,8 +877,115 @@ static void test_boundsrect(void) rect.left, rect.top, rect.right, rect.bottom); } + SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); + MoveToEx( hdc, 10, 10, NULL ); + LineTo( hdc, 20, 20 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + todo_wine + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 10, 10, 21, 21 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + SetRect( &rect, 8, 8, 23, 23 ); + expect = rect; + SetBoundsRect( hdc, &rect, DCB_ACCUMULATE ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + + level = SaveDC( hdc ); + LineTo( hdc, 30, 25 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 8, 8, 31, 26 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + SetBoundsRect( hdc, NULL, DCB_DISABLE ); + LineTo( hdc, 40, 40 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 8, 8, 31, 26 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + SetRect( &rect, 6, 6, 30, 30 ); + SetBoundsRect( hdc, &rect, DCB_ACCUMULATE ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 31, 30 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + + RestoreDC( hdc, level ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + LineTo( hdc, 40, 40 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + + SelectObject( hdc, old ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 1, 1 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + SetBoundsRect( hdc, NULL, DCB_ENABLE ); + LineTo( hdc, 50, 40 ); + + SelectObject( hdc, bitmap ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 51, 41 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + SelectObject( hdc, GetStockObject( NULL_PEN )); + LineTo( hdc, 50, 50 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 51, 51 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + + memset( buffer, 0, sizeof(buffer) ); + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = 64; + info->bmiHeader.biHeight = 64; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 8; + info->bmiHeader.biCompression = BI_RGB; + dib = CreateDIBSection( 0, info, DIB_RGB_COLORS, NULL, NULL, 0 ); + ok( dib != 0, "failed to create DIB\n" ); + SelectObject( hdc, dib ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 51, 51 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + LineTo( hdc, 55, 30 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 56, 51 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + LineTo( hdc, 100, 30 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 6, 6, 64, 51 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + LineTo( hdc, -100, -100 ); + ret = GetBoundsRect( hdc, &rect, 0 ); + ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); + SetRect( &expect, 0, 0, 64, 51 ); + todo_wine + ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + DeleteDC( hdc ); DeleteObject( bitmap ); + DeleteObject( dib ); } static void test_desktop_colorres(void)

1 0

Frédéric Delanoy : Fixes for 1.5. 1 French translation
by Jeremy Newman 09 Apr '12

09 Apr '12

Module: website Branch: master Commit: 651d70b1da11a1910d81db43ed65809d782ce526 URL: http://source.winehq.org/git/website.git/?a=commit;h=651d70b1da11a1910d81db… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Apr 8 10:38:35 2012 +0200 Fixes for 1.5.1 French translation --- news/fr/2012033001.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/news/fr/2012033001.xml b/news/fr/2012033001.xml index 94d4c57..7aff991 100644 --- a/news/fr/2012033001.xml +++ b/news/fr/2012033001.xml @@ -1,9 +1,9 @@ <news> <date></date> -<title>Sortie de Wine 1.5.x</title> +<title>Sortie de Wine 1.5.1</title> <body> - La version de développement 1.5.x de Wine est disponible. - <a href="{$root}/announce/1.5.x">Nouveautés</a> de cette version : + La version de développement 1.5.1 de Wine est disponible. + <a href="{$root}/announce/1.5.1">Nouveautés</a> de cette version : <ul> <li>JavaScript intégré préféré à celui de Gecko dans la plupart des cas.</li> <li>Prise en charge des ressources de polices évolutives.</li> @@ -12,7 +12,7 @@ <li>Diverses corrections de bogues.</li> </ul> Le <a -href="http://prdownloads.sourceforge.net/wine/wine-1.5.x.tar.bz2">code +href="http://prdownloads.sourceforge.net/wine/wine-1.5.1.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs.

1 0