January 2010 - Wine-Commits

Nikolay Sivov : xmllite/tests: Fix a typo in macro.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: 2c9633f676c0a065f528fd78accb1dd791fc0e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9633f676c0a065f528fd78a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 27 13:44:38 2010 +0300 xmllite/tests: Fix a typo in macro. --- dlls/xmllite/tests/reader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 0f51a2f..ed43bb5 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -249,7 +249,7 @@ static void test_read_state_(IXmlReader *reader, XmlReadState expected, state_to_str(expected), state_to_str(state)); } -#define test_read_sate(reader, exp, brk, todo) test_read_state_(reader, exp, brk, todo, __LINE__) +#define test_read_state(reader, exp, brk, todo) test_read_state_(reader, exp, brk, todo, __LINE__) typedef struct _testinput { @@ -355,13 +355,13 @@ static void test_reader_create(void) hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_read_sate(reader, XmlReadState_Closed, -1, FALSE); + test_read_state(reader, XmlReadState_Closed, -1, FALSE); /* Null input pointer, releases previous input */ hr = IXmlReader_SetInput(reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_read_sate(reader, XmlReadState_Initial, XmlReadState_Closed, FALSE); + test_read_state(reader, XmlReadState_Initial, XmlReadState_Closed, FALSE); /* test input interface selection sequence */ hr = testinput_createinstance((void**)&input); @@ -416,7 +416,7 @@ static void test_readerinput(void) hr = IXmlReader_SetInput(reader, reader_input); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_read_sate(reader, XmlReadState_Initial, -1, FALSE); + test_read_state(reader, XmlReadState_Initial, -1, FALSE); /* IXmlReader grabs a IXmlReaderInput reference */ ref = IUnknown_AddRef(reader_input); @@ -431,7 +431,7 @@ static void test_readerinput(void) hr = IXmlReader_SetInput(reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_read_sate(reader, XmlReadState_Initial, XmlReadState_Closed, FALSE); + test_read_state(reader, XmlReadState_Initial, XmlReadState_Closed, FALSE); IXmlReader_Release(reader); @@ -488,7 +488,7 @@ static void test_readerinput(void) ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); ok_iids(&input_iids, setinput_readerinput, NULL, FALSE); - test_read_sate(reader, XmlReadState_Closed, -1, FALSE); + test_read_state(reader, XmlReadState_Closed, -1, FALSE); ref = IUnknown_AddRef(input); ok(ref == 3, "Expected 3, got %d\n", ref);

1 0

Alexandre Julliard : ntdll: Always enable tail checking when running under Valgrind.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: 90f31aa3811ef3e9920796d51b8da748c15cff05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f31aa3811ef3e9920796d51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 13:35:32 2010 +0100 ntdll: Always enable tail checking when running under Valgrind. --- dlls/ntdll/heap.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index c3fdf2c..1055ce0 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -29,6 +29,8 @@ #include <string.h> #ifdef HAVE_VALGRIND_MEMCHECK_H #include <valgrind/memcheck.h> +#else +#define RUNNING_ON_VALGRIND 0 #endif #define NONAMELESSUNION @@ -107,7 +109,7 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); /* minimum size to start allocating large blocks */ #define HEAP_MIN_LARGE_BLOCK_SIZE 0x7f000 /* extra size to add at the end of block for tail checking */ -#define HEAP_TAIL_EXTRA_SIZE(flags) (flags & HEAP_TAIL_CHECKING_ENABLED ? 8 : 0) +#define HEAP_TAIL_EXTRA_SIZE(flags) ((flags & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND ? 8 : 0) /* Max size of the blocks on the free lists */ static const SIZE_T HEAP_freeListSizes[] = @@ -206,16 +208,16 @@ static inline void mark_block_uninitialized( void *ptr, SIZE_T size ) /* mark a block of memory as a tail block */ static inline void mark_block_tail( void *ptr, SIZE_T size, DWORD flags ) { - mark_block_uninitialized( ptr, size ); if (flags & HEAP_TAIL_CHECKING_ENABLED) { + mark_block_uninitialized( ptr, size ); memset( ptr, ARENA_TAIL_FILLER, size ); + } #if defined(VALGRIND_MAKE_MEM_NOACCESS) - VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size )); + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size )); #elif defined( VALGRIND_MAKE_NOACCESS) - VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); + VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); #endif - } } /* initialize contents of a newly created block of memory */

1 0

Henri Verbeet : d3d8: Add depth clamp tests.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: 5f68a2407b1c408096f4ac9121002ea482615bd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f68a2407b1c408096f4ac912… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 26 18:31:36 2010 +0100 d3d8: Add depth clamp tests. --- dlls/d3d8/tests/visual.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 139 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ad5c4c5..f904475 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -154,6 +154,12 @@ struct vertex DWORD diffuse; }; +struct tvertex +{ + float x, y, z, w; + DWORD diffuse; +}; + struct nvertex { float x, y, z; @@ -1292,6 +1298,138 @@ static void texop_test(IDirect3DDevice8 *device) if (texture) IDirect3DTexture8_Release(texture); } +/* This test tests depth clamping / clipping behaviour: + * - When D3DRS_CLIPPING is disabled depth values are *clamped* to the + * minimum/maximum z value. + * - The viewport's MinZ/MaxZ is irrelevant for this. + * - When D3DRS_CLIPPING is enabled depth values are clipped. + * - Pretransformed vertices behave the same as regular vertices. + */ +static void depth_clamp_test(IDirect3DDevice8 *device) +{ + const struct tvertex quad1[] = + { + { 0, 0, 5.0f, 1.0, 0xff002b7f}, + { 640, 0, 5.0f, 1.0, 0xff002b7f}, + { 0, 480, 5.0f, 1.0, 0xff002b7f}, + { 640, 480, 5.0f, 1.0, 0xff002b7f}, + }; + const struct tvertex quad2[] = + { + { 0, 300, 10.0f, 1.0, 0xfff9e814}, + { 640, 300, 10.0f, 1.0, 0xfff9e814}, + { 0, 360, 10.0f, 1.0, 0xfff9e814}, + { 640, 360, 10.0f, 1.0, 0xfff9e814}, + }; + const struct vertex quad3[] = + { + {-0.65, 0.55, 5.0f, 0xffffffff}, + {-0.35, 0.55, 5.0f, 0xffffffff}, + {-0.65, 0.15, 5.0f, 0xffffffff}, + {-0.35, 0.15, 5.0f, 0xffffffff}, + }; + const struct vertex quad4[] = + { + {-0.87, 0.83, 10.0f, 0xffffffff}, + {-0.65, 0.83, 10.0f, 0xffffffff}, + {-0.87, 0.55, 10.0f, 0xffffffff}, + {-0.65, 0.55, 10.0f, 0xffffffff}, + }; + const struct vertex quad5[] = + { + { -0.5, 0.5, 10.0f, 0xff14f914}, + { 0.5, 0.5, 10.0f, 0xff14f914}, + { -0.5, -0.5, 10.0f, 0xff14f914}, + { 0.5, -0.5, 10.0f, 0xff14f914}, + }; + const struct tvertex quad6[] = + { + { 0, 120, 10.0f, 1.0, 0xfff91414}, + { 640, 120, 10.0f, 1.0, 0xfff91414}, + { 0, 180, 10.0f, 1.0, 0xfff91414}, + { 640, 180, 10.0f, 1.0, 0xfff91414}, + }; + + D3DVIEWPORT8 vp; + D3DCOLOR color; + HRESULT hr; + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinZ = 0.0; + vp.MaxZ = 7.5; + + hr = IDirect3DDevice8_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetVertexSahder failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(*quad1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, sizeof(*quad3)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad4, sizeof(*quad4)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad5, sizeof(*quad5)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad6, sizeof(*quad6)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + color = getPixelColor(device, 75, 75); + todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 150); + todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 330); + todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 330); + todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + hr = IDirect3DDevice8_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -1347,6 +1485,7 @@ START_TEST(visual) IDirect3DDevice8_Present(device_ptr, NULL, NULL, NULL, NULL); /* Now run the real test */ + depth_clamp_test(device_ptr); lighting_test(device_ptr); clear_test(device_ptr); fog_test(device_ptr);

1 0

Alexandre Julliard : ntdll: Add 8 more bytes to the block tail when tail checking is enabled.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: 31aa3900e4f861016467a8e94a4424cf545a1e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31aa3900e4f861016467a8e94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 13:33:53 2010 +0100 ntdll: Add 8 more bytes to the block tail when tail checking is enabled. --- dlls/kernel32/tests/heap.c | 14 +++++++++++++- dlls/ntdll/heap.c | 8 +++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 81850fe..0c0de11 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -488,7 +488,7 @@ static void test_heap_checks( DWORD flags ) { BYTE old, *p, *p2; BOOL ret; - SIZE_T size, large_size = 800 * 1024 + 37; + SIZE_T i, size, large_size = 800 * 1024 + 37; if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */ trace( "testing heap flags %08x\n", flags ); @@ -640,6 +640,18 @@ static void test_heap_checks( DWORD flags ) ret = HeapFree( GetProcessHeap(), 0, p ); ok( ret, "HeapFree failed\n" ); + + /* test block sizes when tail checking */ + if (flags & HEAP_TAIL_CHECKING_ENABLED) + { + for (size = 0; size < 64; size++) + { + p = HeapAlloc( GetProcessHeap(), 0, size ); + for (i = 0; i < 32; i++) if (p[size + i] != 0xab) break; + ok( i >= 8, "only %lu tail bytes for size %lu\n", i, size ); + HeapFree( GetProcessHeap(), 0, p ); + } + } } static void test_debug_heap( const char *argv0, DWORD flags ) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 29e9559..c3fdf2c 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -106,6 +106,8 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) /* minimum size to start allocating large blocks */ #define HEAP_MIN_LARGE_BLOCK_SIZE 0x7f000 +/* extra size to add at the end of block for tail checking */ +#define HEAP_TAIL_EXTRA_SIZE(flags) (flags & HEAP_TAIL_CHECKING_ENABLED ? 8 : 0) /* Max size of the blocks on the free lists */ static const SIZE_T HEAP_freeListSizes[] = @@ -677,7 +679,7 @@ static void HEAP_ShrinkBlock(SUBHEAP *subheap, ARENA_INUSE *pArena, SIZE_T size) static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) { ARENA_LARGE *arena; - SIZE_T block_size = sizeof(*arena) + ROUND_SIZE(size); + SIZE_T block_size = sizeof(*arena) + ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); LPVOID address = NULL; if (block_size < size) return NULL; /* overflow */ @@ -1581,7 +1583,7 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) if (!heapPtr) return NULL; flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY; flags |= heapPtr->flags; - rounded_size = ROUND_SIZE(size); + rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE( flags ); if (rounded_size < size) /* overflow */ { if (flags & HEAP_GENERATE_EXCEPTIONS) RtlRaiseStatus( STATUS_NO_MEMORY ); @@ -1735,7 +1737,7 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size flags |= heapPtr->flags; if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterCriticalSection( &heapPtr->critSection ); - rounded_size = ROUND_SIZE(size); + rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); if (rounded_size < size) goto oom; /* overflow */ if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE;

1 0

Alexandre Julliard : ntdll: Simplify the checking of heap pointers when debugging is not enabled.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: d387a34d96b5d77f225f86f0420c456d03c05a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d387a34d96b5d77f225f86f04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 13:30:52 2010 +0100 ntdll: Simplify the checking of heap pointers when debugging is not enabled. --- dlls/ntdll/heap.c | 94 +++++++++++++++++++++++++++++++++++----------------- 1 files changed, 63 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2e0dcc6..29e9559 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1333,6 +1333,52 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, /* [in] ptr to the heap */ /*********************************************************************** + * validate_block_pointer + * + * Minimum validation needed to catch bad parameters in heap functions. + */ +static BOOL validate_block_pointer( HEAP *heap, SUBHEAP **ret_subheap, const ARENA_INUSE *arena ) +{ + SUBHEAP *subheap; + BOOL ret = FALSE; + + if (!(*ret_subheap = subheap = HEAP_FindSubHeap( heap, arena ))) + { + ARENA_LARGE *large_arena = find_large_block( heap, arena + 1 ); + + if (!large_arena) + { + WARN( "Heap %p: pointer %p is not inside heap\n", heap, arena + 1 ); + return FALSE; + } + if ((heap->flags & HEAP_VALIDATE) && !validate_large_arena( heap, large_arena, QUIET )) + return FALSE; + return TRUE; + } + + if ((char *)arena < (char *)subheap->base + subheap->headerSize) + WARN( "Heap %p: pointer %p is inside subheap %p header\n", subheap->heap, arena + 1, subheap ); + else if (subheap->heap->flags & HEAP_VALIDATE) /* do the full validation */ + ret = HEAP_ValidateInUseArena( subheap, arena, QUIET ); + else if ((ULONG_PTR)arena % ALIGNMENT != ARENA_OFFSET) + WARN( "Heap %p: unaligned arena pointer %p\n", subheap->heap, arena ); + else if (arena->magic != ARENA_INUSE_MAGIC) + WARN( "Heap %p: invalid in-use arena magic %08x for %p\n", subheap->heap, arena->magic, arena ); + else if (arena->size & ARENA_FLAG_FREE) + ERR( "Heap %p: bad flags %08x for in-use arena %p\n", + subheap->heap, arena->size & ~ARENA_SIZE_MASK, arena ); + else if ((const char *)(arena + 1) + (arena->size & ARENA_SIZE_MASK) > (const char *)subheap->base + subheap->size || + (const char *)(arena + 1) + (arena->size & ARENA_SIZE_MASK) < (const char *)(arena + 1)) + ERR( "Heap %p: bad size %08x for in-use arena %p\n", + subheap->heap, arena->size & ARENA_SIZE_MASK, arena ); + else + ret = TRUE; + + return ret; +} + + +/*********************************************************************** * heap_set_debug_flags */ void heap_set_debug_flags( HANDLE handle ) @@ -1633,24 +1679,13 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr ) /* Some sanity checks */ pInUse = (ARENA_INUSE *)ptr - 1; - if (!(subheap = HEAP_FindSubHeap( heapPtr, pInUse ))) - { - ARENA_LARGE *large_arena = find_large_block( heapPtr, ptr ); + if (!validate_block_pointer( heapPtr, &subheap, pInUse )) goto error; - if (!large_arena) goto error; - if ((heapPtr->flags & HEAP_VALIDATE) && !validate_large_arena( heapPtr, large_arena, QUIET )) - goto error; + if (!subheap) free_large_block( heapPtr, flags, ptr ); - goto done; - } - if ((char *)pInUse < (char *)subheap->base + subheap->headerSize) goto error; - if (!HEAP_ValidateInUseArena( subheap, pInUse, QUIET )) goto error; - - /* Turn the block into a free block */ - - HEAP_MakeInUseBlockFree( subheap, pInUse ); + else + HEAP_MakeInUseBlockFree( subheap, pInUse ); -done: if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); TRACE("(%p,%08x,%p): returning TRUE\n", heap, flags, ptr ); return TRUE; @@ -1705,19 +1740,13 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; pArena = (ARENA_INUSE *)ptr - 1; - if (!(subheap = HEAP_FindSubHeap( heapPtr, pArena ))) + if (!validate_block_pointer( heapPtr, &subheap, pArena )) goto error; + if (!subheap) { - ARENA_LARGE *large_arena = find_large_block( heapPtr, ptr ); - - if (!large_arena) goto error; - if ((heapPtr->flags & HEAP_VALIDATE) && !validate_large_arena( heapPtr, large_arena, QUIET )) - goto error; if (!(ret = realloc_large_block( heapPtr, flags, ptr, size ))) goto oom; notify_free( ptr ); goto done; } - if ((char *)pArena < (char *)subheap->base + subheap->headerSize) goto error; - if (!HEAP_ValidateInUseArena( subheap, pArena, QUIET )) goto error; /* Check if we need to grow the block */ @@ -1910,6 +1939,8 @@ BOOLEAN WINAPI RtlUnlockHeap( HANDLE heap ) SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr ) { SIZE_T ret; + const ARENA_INUSE *pArena; + SUBHEAP *subheap; HEAP *heapPtr = HEAP_GetPtr( heap ); if (!heapPtr) @@ -1920,20 +1951,21 @@ SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr ) flags &= HEAP_NO_SERIALIZE; flags |= heapPtr->flags; if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterCriticalSection( &heapPtr->critSection ); - if (!HEAP_IsRealArena( heapPtr, HEAP_NO_SERIALIZE, ptr, QUIET )) + + pArena = (const ARENA_INUSE *)ptr - 1; + if (!validate_block_pointer( heapPtr, &subheap, pArena )) { RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); ret = ~0UL; } + else if (!subheap) + { + const ARENA_LARGE *large_arena = (const ARENA_LARGE *)ptr - 1; + ret = large_arena->data_size; + } else { - const ARENA_INUSE *pArena = (const ARENA_INUSE *)ptr - 1; - if (pArena->size == ARENA_LARGE_SIZE) - { - const ARENA_LARGE *large_arena = (const ARENA_LARGE *)ptr - 1; - ret = large_arena->data_size; - } - else ret = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; + ret = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; } if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );

1 0

Igor Paliychuk : credui: Add Ukrainian translation.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: 3091c6f7ced12da78f405209a71df017c0b01d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3091c6f7ced12da78f405209a… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 21:43:55 2010 +0200 credui: Add Ukrainian translation. --- dlls/credui/Makefile.in | 1 + dlls/credui/credui_Uk.rc | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index f29278c..34ba773 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -26,6 +26,7 @@ RC_SRCS = \ credui_Ru.rc \ credui_Si.rc \ credui_Sv.rc \ + credui_Uk.rc \ credui_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/credui/credui_Uk.rc b/dlls/credui/credui_Uk.rc new file mode 100644 index 0000000..e7c04ab --- /dev/null +++ b/dlls/credui/credui_Uk.rc @@ -0,0 +1,56 @@ +/* + * Ukrainian language resource file for Credentials UI + * + * Copyright 2007 Robert Shearman (for CodeWeavers) + * Copyright 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "credui_resources.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Користувач:",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Пароль:",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Запам'ятати мій пароль",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Скасувати",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Під'єднатись до %s" + IDS_MESSAGEFORMAT "Під'єднуюсь до %s" + IDS_INCORRECTPASSWORDTITLE "Вхід не відбувся" + IDS_INCORRECTPASSWORD "Переконайтесь що ім'я користувача\nі пароль правильні." + IDS_CAPSLOCKONTITLE "Caps Lock включений" + IDS_CAPSLOCKON "Пароль може бути введений неправильно через натиснену клавішу Caps Lock.\n\nВимкніть Caps Lock перед\nвведенням паролю." +}

1 0

Henri Verbeet : wined3d: Get rid of the depth range hack.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: 69861cf8730047a06ad898f9b45a4914a172745c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69861cf8730047a06ad898f9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 26 18:31:38 2010 +0100 wined3d: Get rid of the depth range hack. --- dlls/d3d8/tests/visual.c | 8 +++--- dlls/d3d9/tests/visual.c | 8 +++--- dlls/ddraw/tests/visual.c | 8 +++--- dlls/wined3d/state.c | 66 +++++++------------------------------------- 4 files changed, 23 insertions(+), 67 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f904475..0ea1bd2 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1411,15 +1411,15 @@ static void depth_clamp_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); color = getPixelColor(device, 75, 75); - todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 150, 150); - todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 240); ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0d78271..875d2be 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10685,15 +10685,15 @@ static void depth_clamp_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); color = getPixelColor(device, 75, 75); - todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 150, 150); - todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 240); ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 00b0bb3..6d4cf2e 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -2795,15 +2795,15 @@ static void depth_clamp_test(IDirect3DDevice7 *device) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); color = getPixelColor(device, 75, 75); - todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 150, 150); - todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 240); ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); vp.dvMinZ = 0.0; vp.dvMaxZ = 1.0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d44dc2c..247710c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3884,62 +3884,18 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock glLoadIdentity(); checkGLcall("glLoadIdentity"); - if(context->last_was_rhw) { - double X, Y, height, width, minZ, maxZ; - - X = stateblock->viewport.X; - Y = stateblock->viewport.Y; - height = stateblock->viewport.Height; - width = stateblock->viewport.Width; - minZ = stateblock->viewport.MinZ; - maxZ = stateblock->viewport.MaxZ; + if (context->last_was_rhw) + { + double x = stateblock->viewport.X; + double y = stateblock->viewport.Y; + double w = stateblock->viewport.Width; + double h = stateblock->viewport.Height; - if (!stateblock->device->untransformed) - { - /* Transformed vertices are supposed to bypass the whole transform pipeline including - * frustum clipping. This can't be done in opengl, so this code adjusts the Z range to - * suppress depth clipping. This can be done because it is an orthogonal projection and - * the Z coordinate does not affect the size of the primitives. Half Life 1 and Prince of - * Persia 3D need this. - * - * Note that using minZ and maxZ here doesn't entirely fix the problem, since view frustum - * clipping is still enabled, but it seems to fix it for all apps tested so far. A minor - * problem can be witnessed in half-life 1 engine based games, the weapon is clipped close - * to the viewer. - * - * Also note that this breaks z comparison against z values filled in with clear, - * but no app depending on that and disabled clipping has been found yet. Comparing - * primitives against themselves works, so the Z buffer is still intact for normal hidden - * surface removal. - * - * We could disable clipping entirely by setting the near to infinity and far to -infinity, - * but this would break Z buffer operation. Raising the range to something less than - * infinity would help a bit at the cost of Z precision, but it wouldn't eliminate the - * problem either. - */ - TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, -minZ, -maxZ); - if (context->render_offscreen) - { - glOrtho(X, X + width, -Y, -Y - height, -minZ, -maxZ); - } else { - glOrtho(X, X + width, Y + height, Y, -minZ, -maxZ); - } - } else { - /* If the app mixes transformed and untransformed primitives we can't use the coordinate system - * trick above because this would mess up transformed and untransformed Z order. Pass the z position - * unmodified to opengl. - * - * If the app depends on mixed types and disabled clipping we're out of luck without a pipeline - * replacement shader. - */ - TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, 1.0, -1.0); - if (context->render_offscreen) - { - glOrtho(X, X + width, -Y, -Y - height, 0.0, -1.0); - } else { - glOrtho(X, X + width, Y + height, Y, 0.0, -1.0); - } - } + TRACE("Calling glOrtho with x %.8e, y %.8e, w %.8e, h %.8e.\n", x, y, w, h); + if (context->render_offscreen) + glOrtho(x, x + w, -y, -y - h, 0.0, -1.0); + else + glOrtho(x, x + w, y + h, y, 0.0, -1.0); checkGLcall("glOrtho"); /* Window Coord 0 is the middle of the first pixel, so translate by 1/2 pixels */

1 0

Henri Verbeet : ddraw: Add depth clamp tests.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: ec03d3e4f1e3017a016d0644196602796513012c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec03d3e4f1e3017a016d06441… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 26 18:31:37 2010 +0100 ddraw: Add depth clamp tests. --- dlls/ddraw/tests/visual.c | 158 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 158 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index ac70b31..00b0bb3 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -27,6 +27,7 @@ HWND window; IDirectDraw7 *DirectDraw = NULL; IDirectDrawSurface7 *Surface; +IDirectDrawSurface7 *depth_buffer; IDirect3D7 *Direct3D = NULL; IDirect3DDevice7 *Direct3DDevice = NULL; @@ -41,6 +42,18 @@ static BOOL refdevice = FALSE; static HRESULT (WINAPI *pDirectDrawCreateEx)(LPGUID,LPVOID*,REFIID,LPUNKNOWN); +static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) +{ + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + return TRUE; +} + static BOOL createObjects(void) { HRESULT hr; @@ -93,6 +106,24 @@ static BOOL createObjects(void) hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &Surface, NULL); if(FAILED(hr)) goto err; + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(ddsd).ddpfPixelFormat).dwZBufferBitDepth = 32; + U3(U4(ddsd).ddpfPixelFormat).dwZBitMask = 0xffffffff; + ddsd.dwWidth = 640; + ddsd.dwHeight = 480; + hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &depth_buffer, NULL); + ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x.\n", hr); + if (FAILED(hr)) goto err; + + hr = IDirectDrawSurface_AddAttachedSurface(Surface, depth_buffer); + ok(SUCCEEDED(hr), "AddAttachedSurface failed, hr %#x.\n", hr); + if (FAILED(hr)) goto err; + hr = IDirect3D7_CreateDevice(Direct3D, &IID_IDirect3DTnLHalDevice, Surface, &Direct3DDevice); if(FAILED(hr)) { @@ -111,6 +142,7 @@ static BOOL createObjects(void) err: if(DirectDraw) IDirectDraw7_Release(DirectDraw); + if (depth_buffer) IDirectDrawSurface7_Release(depth_buffer); if(Surface) IDirectDrawSurface7_Release(Surface); if(Direct3D) IDirect3D7_Release(Direct3D); if(Direct3DDevice) IDirect3DDevice7_Release(Direct3DDevice); @@ -122,6 +154,7 @@ static void releaseObjects(void) { IDirect3DDevice7_Release(Direct3DDevice); IDirect3D7_Release(Direct3D); + IDirectDrawSurface7_Release(depth_buffer); IDirectDrawSurface7_Release(Surface); IDirectDraw7_Release(DirectDraw); DestroyWindow(window); @@ -210,6 +243,12 @@ struct vertex DWORD diffuse; }; +struct tvertex +{ + float x, y, z, w; + DWORD diffuse; +}; + struct nvertex { float x, y, z; @@ -2654,6 +2693,124 @@ out: IDirectDrawSurface7_Release(cubemap); } +/* This test tests depth clamping / clipping behaviour: + * - When D3DRS_CLIPPING is disabled depth values are *clamped* to the + * minimum/maximum z value. + * - The viewport's MinZ/MaxZ is irrelevant for this. + * - When D3DRS_CLIPPING is enabled depth values are clipped. + * - Pretransformed vertices behave the same as regular vertices. + */ +static void depth_clamp_test(IDirect3DDevice7 *device) +{ + struct tvertex quad1[] = + { + { 0, 0, 5.0f, 1.0, 0xff002b7f}, + { 640, 0, 5.0f, 1.0, 0xff002b7f}, + { 0, 480, 5.0f, 1.0, 0xff002b7f}, + { 640, 480, 5.0f, 1.0, 0xff002b7f}, + }; + struct tvertex quad2[] = + { + { 0, 300, 10.0f, 1.0, 0xfff9e814}, + { 640, 300, 10.0f, 1.0, 0xfff9e814}, + { 0, 360, 10.0f, 1.0, 0xfff9e814}, + { 640, 360, 10.0f, 1.0, 0xfff9e814}, + }; + struct vertex quad3[] = + { + {-0.65, 0.55, 5.0f, 0xffffffff}, + {-0.35, 0.55, 5.0f, 0xffffffff}, + {-0.65, 0.15, 5.0f, 0xffffffff}, + {-0.35, 0.15, 5.0f, 0xffffffff}, + }; + struct vertex quad4[] = + { + {-0.87, 0.83, 10.0f, 0xffffffff}, + {-0.65, 0.83, 10.0f, 0xffffffff}, + {-0.87, 0.55, 10.0f, 0xffffffff}, + {-0.65, 0.55, 10.0f, 0xffffffff}, + }; + struct vertex quad5[] = + { + { -0.5, 0.5, 10.0f, 0xff14f914}, + { 0.5, 0.5, 10.0f, 0xff14f914}, + { -0.5, -0.5, 10.0f, 0xff14f914}, + { 0.5, -0.5, 10.0f, 0xff14f914}, + }; + struct tvertex quad6[] = + { + { 0, 120, 10.0f, 1.0, 0xfff91414}, + { 640, 120, 10.0f, 1.0, 0xfff91414}, + { 0, 180, 10.0f, 1.0, 0xfff91414}, + { 640, 180, 10.0f, 1.0, 0xfff91414}, + }; + + D3DVIEWPORT7 vp; + D3DCOLOR color; + HRESULT hr; + + vp.dwX = 0; + vp.dwY = 0; + vp.dwWidth = 640; + vp.dwHeight = 480; + vp.dvMinZ = 0.0; + vp.dvMaxZ = 7.5; + + hr = IDirect3DDevice7_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE, quad1, 4, 0); + ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE, quad2, 4, 0); + ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad3, 4, 0); + ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad4, 4, 0); + ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad5, 4, 0); + ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE, quad6, 4, 0); + ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + color = getPixelColor(device, 75, 75); + todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 150); + todo_wine ok(color_match(color, 0x00ffffff, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 330); + todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 320, 330); + todo_wine ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + + vp.dvMinZ = 0.0; + vp.dvMaxZ = 1.0; + hr = IDirect3DDevice7_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); +} + START_TEST(visual) { HRESULT hr; @@ -2694,6 +2851,7 @@ START_TEST(visual) } /* Now run the tests */ + depth_clamp_test(Direct3DDevice); lighting_test(Direct3DDevice); clear_test(Direct3DDevice); fog_test(Direct3DDevice);

1 0

Paul Vriens : wininet/tests: Fix test failures on Win98/ WinMe by using more A-functions.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: a28433a232e7d14359870a6ab8042e83090d2a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28433a232e7d14359870a6ab… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 27 10:08:15 2010 +0100 wininet/tests: Fix test failures on Win98/WinMe by using more A-functions. --- dlls/wininet/tests/internet.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 9e010da..5885eb0 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -40,6 +40,16 @@ static BOOL (WINAPI *pIsDomainLegalCookieDomainW)(LPCWSTR, LPCWSTR); static DWORD (WINAPI *pPrivacyGetZonePreferenceW)(DWORD, DWORD, LPDWORD, LPWSTR, LPDWORD); static DWORD (WINAPI *pPrivacySetZonePreferenceW)(DWORD, DWORD, DWORD, LPCWSTR); +/* Win9x and WinMe don't have lstrcmpW */ +static int strcmp_ww(const WCHAR *str1, const WCHAR *str2) +{ + DWORD len1 = lstrlenW(str1); + DWORD len2 = lstrlenW(str2); + + if (len1 != len2) return 1; + return memcmp(str1, str2, len1 * sizeof(WCHAR)); +} + /* ############################### */ static void test_InternetCanonicalizeUrlA(void) @@ -466,7 +476,7 @@ static void test_null(void) ok( sz == 1 + lstrlenW(buffer) || sz == lstrlenW(buffer), "sz wrong %d\n", sz); /* before XP SP2, buffer is "server; server" */ - ok( !lstrcmpW(szExpect, buffer) || !lstrcmpW(szServer, buffer), "cookie data wrong\n"); + ok( !strcmp_ww(szExpect, buffer) || !strcmp_ww(szServer, buffer), "cookie data wrong\n"); sz = sizeof(buffer); r = InternetQueryOptionA(NULL, INTERNET_OPTION_CONNECTED_STATE, buffer, &sz); @@ -855,17 +865,14 @@ static void r_verifyProxyEnable(LONG l, DWORD exp) HKEY hkey; DWORD type, val, size = sizeof(DWORD); LONG ret; - static const WCHAR szInternetSettings[] = - { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0 }; - static const WCHAR szProxyEnable[] = { 'P','r','o','x','y','E','n','a','b','l','e', 0 }; + static const CHAR szInternetSettings[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; + static const CHAR szProxyEnable[] = "ProxyEnable"; - ret = RegOpenKeyW(HKEY_CURRENT_USER, szInternetSettings, &hkey); - ok_(__FILE__,l) (!ret, "RegOpenKeyW failed: 0x%08x\n", ret); + ret = RegOpenKeyA(HKEY_CURRENT_USER, szInternetSettings, &hkey); + ok_(__FILE__,l) (!ret, "RegOpenKeyA failed: 0x%08x\n", ret); - ret = RegQueryValueExW(hkey, szProxyEnable, 0, &type, (BYTE*)&val, &size); - ok_(__FILE__,l) (!ret, "RegQueryValueExW failed: 0x%08x\n", ret); + ret = RegQueryValueExA(hkey, szProxyEnable, 0, &type, (BYTE*)&val, &size); + ok_(__FILE__,l) (!ret, "RegQueryValueExA failed: 0x%08x\n", ret); ok_(__FILE__,l) (type == REG_DWORD, "Expected regtype to be REG_DWORD, was: %d\n", type); ok_(__FILE__,l) (val == exp, "Expected ProxyEnabled to be %d, got: %d\n", exp, val); @@ -919,7 +926,7 @@ static void test_Option_PerConnectionOption(void) ret = InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, &size); ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); - ok(!lstrcmpW(list.pOptions[0].Value.pszValue, proxy_srvW), + ok(!strcmp_ww(list.pOptions[0].Value.pszValue, proxy_srvW), "Retrieved proxy server should've been %s, was: %s\n", wine_dbgstr_w(proxy_srvW), wine_dbgstr_w(list.pOptions[0].Value.pszValue)); ok(list.pOptions[1].Value.dwValue == PROXY_TYPE_PROXY,

1 0

Alexandre Julliard : dbghelp: Don't require a 16-bit stack for StackWalk.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: e42d1a8cc1b1b6b6e1417156cdc17fad250556b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e42d1a8cc1b1b6b6e1417156c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 11:16:45 2010 +0100 dbghelp: Don't require a 16-bit stack for StackWalk. --- dlls/dbghelp/cpu_i386.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index a83f0fa..32a341f 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -146,7 +146,11 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame) goto done_err; } next_switch = p; - if (curr_mode == stm_16bit) + if (!next_switch) /* no 16-bit stack */ + { + curr_switch = 0; + } + else if (curr_mode == stm_16bit) { if (!sw_read_mem(csw, next_switch, &frame32, sizeof(frame32))) {

1 0