October 2008 - Wine-commits

Alexandre Julliard : ntdll: Merge HEAP_InitSubHeap and HEAP_CreateSubHeap.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: bb98004249cfed7db9722e35a81bcc74edf949e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb98004249cfed7db9722e35a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 13:00:15 2008 +0100 ntdll: Merge HEAP_InitSubHeap and HEAP_CreateSubHeap. --- dlls/ntdll/heap.c | 74 +++++++++++++++++----------------------------------- 1 files changed, 24 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index fdd7946..7abe85d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -755,24 +755,37 @@ static BOOL validate_large_arena( HEAP *heap, const ARENA_LARGE *arena, BOOL qui /*********************************************************************** - * HEAP_InitSubHeap + * HEAP_CreateSubHeap */ -static SUBHEAP *HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags, - SIZE_T commitSize, SIZE_T totalSize ) +static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, + SIZE_T commitSize, SIZE_T totalSize ) { SUBHEAP *subheap; FREE_LIST_ENTRY *pEntry; unsigned int i; - /* Commit memory */ - - if (flags & HEAP_SHARED) - commitSize = totalSize; /* always commit everything in a shared heap */ - if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, - &commitSize, MEM_COMMIT, get_protection_type( flags ) )) + if (!address) { - WARN("Could not commit %08lx bytes for sub-heap %p\n", commitSize, address ); - return NULL; + /* round-up sizes on a 64K boundary */ + totalSize = (totalSize + 0xffff) & 0xffff0000; + commitSize = (commitSize + 0xffff) & 0xffff0000; + if (!commitSize) commitSize = 0x10000; + if (totalSize < commitSize) totalSize = commitSize; + if (flags & HEAP_SHARED) commitSize = totalSize; /* always commit everything in a shared heap */ + + /* allocate the memory block */ + if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize, + MEM_RESERVE, get_protection_type( flags ) )) + { + WARN("Could not allocate %08lx bytes\n", totalSize ); + return NULL; + } + if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, + &commitSize, MEM_COMMIT, get_protection_type( flags ) )) + { + WARN("Could not commit %08lx bytes for sub-heap %p\n", commitSize, address ); + return NULL; + } } if (heap) @@ -857,45 +870,6 @@ static SUBHEAP *HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags, return subheap; } -/*********************************************************************** - * HEAP_CreateSubHeap - * - * Create a sub-heap of the given size. - * If heap == NULL, creates a main heap. - */ -static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, void *base, DWORD flags, - SIZE_T commitSize, SIZE_T totalSize ) -{ - LPVOID address = base; - SUBHEAP *ret; - - /* round-up sizes on a 64K boundary */ - totalSize = (totalSize + 0xffff) & 0xffff0000; - commitSize = (commitSize + 0xffff) & 0xffff0000; - if (!commitSize) commitSize = 0x10000; - if (totalSize < commitSize) totalSize = commitSize; - - if (!address) - { - /* allocate the memory block */ - if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize, - MEM_RESERVE, get_protection_type( flags ) )) - { - WARN("Could not allocate %08lx bytes\n", totalSize ); - return NULL; - } - } - - /* Initialize subheap */ - - if (!(ret = HEAP_InitSubHeap( heap, address, flags, commitSize, totalSize ))) - { - SIZE_T size = 0; - if (!base) NtFreeVirtualMemory( NtCurrentProcess(), &address, &size, MEM_RELEASE ); - } - return ret; -} - /*********************************************************************** * HEAP_FindFreeBlock

1 0

David Adam : d3dx8: Implement ID3DXMatrixStack_LoadMatrix.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 253d89b954c875533dba316a6b517cc6556494b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253d89b954c875533dba316a6… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Oct 30 17:38:55 2008 +0100 d3dx8: Implement ID3DXMatrixStack_LoadMatrix. --- dlls/d3dx8/math.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 956a6a0..9a8c530 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -674,8 +674,13 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + if (!pm) return D3DERR_INVALIDCALL; + This->stack[This->current] = *pm; + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm)

1 0

Henri Verbeet : d3dx8: Make expect_mat a bit more useable.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: bbc2f7d713b2a7626228cd8ff98db7b505bbdfe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc2f7d713b2a7626228cd8ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 30 17:38:55 2008 +0100 d3dx8: Make expect_mat a bit more useable. --- dlls/d3dx8/tests/math.c | 111 +++++++++++++++++++++++++---------------------- 1 files changed, 59 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbc2f7d713b2a7626228c…

1 0

Henri Verbeet : d3dx8: Add a few tests for ID3DXMatrixStack.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 5302d2b311203efca3818faa950b3da9e61af1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5302d2b311203efca3818faa9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 30 17:38:55 2008 +0100 d3dx8: Add a few tests for ID3DXMatrixStack. --- dlls/d3dx8/tests/math.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index b600b1a..f38ff26 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -1403,6 +1403,86 @@ static void D3X8Vector4Test(void) expect_vec4(expectedtrans,gottrans); } +static void test_matrix_stack(void) +{ + ID3DXMatrixStack *stack; + ULONG refcount; + HRESULT hr; + + const D3DXMATRIX mat1 = {{{ + 1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 13.0f, 14.0f, 15.0f, 16.0f + }}}; + + const D3DXMATRIX mat2 = {{{ + 17.0f, 18.0f, 19.0f, 20.0f, + 21.0f, 22.0f, 23.0f, 24.0f, + 25.0f, 26.0f, 27.0f, 28.0f, + 29.0f, 30.0f, 31.0f, 32.0f + }}}; + + hr = D3DXCreateMatrixStack(0, &stack); + ok(SUCCEEDED(hr), "Failed to create a matrix stack, hr %#x\n", hr); + if (FAILED(hr)) return; + + ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), + "The top of an empty matrix stack should be an identity matrix\n"); + + hr = ID3DXMatrixStack_Pop(stack); + ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); + + hr = ID3DXMatrixStack_Push(stack); + ok(SUCCEEDED(hr), "Push failed, hr %#x\n", hr); + ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); + + hr = ID3DXMatrixStack_Push(stack); + ok(SUCCEEDED(hr), "Push failed, hr %#x\n", hr); + + hr = ID3DXMatrixStack_LoadMatrix(stack, NULL); + ok(hr == D3DERR_INVALIDCALL, "LoadMatrix returned %#x, expected D3DERR_INVALIDCALL\n", hr); + + hr = ID3DXMatrixStack_LoadMatrix(stack, &mat1); + ok(SUCCEEDED(hr), "LoadMatrix failed, hr %#x\n", hr); + expect_mat(&mat1, ID3DXMatrixStack_GetTop(stack)); + + hr = ID3DXMatrixStack_Push(stack); + ok(SUCCEEDED(hr), "Push failed, hr %#x\n", hr); + expect_mat(&mat1, ID3DXMatrixStack_GetTop(stack)); + + hr = ID3DXMatrixStack_LoadMatrix(stack, &mat2); + ok(SUCCEEDED(hr), "LoadMatrix failed, hr %#x\n", hr); + expect_mat(&mat2, ID3DXMatrixStack_GetTop(stack)); + + hr = ID3DXMatrixStack_Push(stack); + ok(SUCCEEDED(hr), "Push failed, hr %#x\n", hr); + expect_mat(&mat2, ID3DXMatrixStack_GetTop(stack)); + + hr = ID3DXMatrixStack_LoadIdentity(stack); + ok(SUCCEEDED(hr), "LoadIdentity failed, hr %#x\n", hr); + ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); + + hr = ID3DXMatrixStack_Pop(stack); + ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); + expect_mat(&mat2, ID3DXMatrixStack_GetTop(stack)); + + hr = ID3DXMatrixStack_Pop(stack); + ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); + expect_mat(&mat1, ID3DXMatrixStack_GetTop(stack)); + + hr = ID3DXMatrixStack_Pop(stack); + ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); + ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); + + hr = ID3DXMatrixStack_Pop(stack); + ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); + ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); + + refcount = ID3DXMatrixStack_Release(stack); + ok(!refcount, "Matrix stack has %u references left.\n", refcount); +} + START_TEST(math) { D3DXColorTest(); @@ -1412,4 +1492,5 @@ START_TEST(math) D3X8Vector2Test(); D3X8Vector3Test(); D3X8Vector4Test(); + test_matrix_stack(); }

1 0

Michael Stefaniuc : comdlg32: Don't cast the return value of GetProp() as it is a HANLE aka void pointer.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 48960eef2c2875dea2c2c2521d8678d129f90fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48960eef2c2875dea2c2c2521… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 22:31:35 2008 +0100 comdlg32: Don't cast the return value of GetProp() as it is a HANLE aka void pointer. --- dlls/comdlg32/colordlg.c | 33 ++++++++++++---------- dlls/comdlg32/filedlg.c | 57 ++++++++++++++++++--------------------- dlls/comdlg32/filedlgbrowser.c | 14 +++++----- dlls/comdlg32/finddlg32.c | 2 +- dlls/comdlg32/fontdlg.c | 4 +- dlls/comdlg32/printdlg.c | 10 +++--- dlls/comdlg32/printdlg16.c | 2 +- 7 files changed, 60 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48960eef2c2875dea2c2c…

1 0

David Adam : d3dx8: Implement ID3DXMatrixStack_LoadIdentity.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 517dad96ae50c1046557d1b9f6efa6c8f21db558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517dad96ae50c1046557d1b9f… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Oct 30 17:38:55 2008 +0100 d3dx8: Implement ID3DXMatrixStack_LoadIdentity. --- dlls/d3dx8/math.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 20d6364..956a6a0 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -663,8 +663,12 @@ static D3DXMATRIX* WINAPI ID3DXMatrixStackImpl_GetTop(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + D3DXMatrixIdentity(&This->stack[This->current]); + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm)

1 0

Lei Zhang : ntdll: Skip deleted files in read_directory_getdents.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 7fca3486ad3d9b13f47945d6fd123cec9acfee66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fca3486ad3d9b13f47945d6f… Author: Lei Zhang <thestig(a)google.com> Date: Thu Oct 30 11:59:00 2008 -0700 ntdll: Skip deleted files in read_directory_getdents. --- dlls/ntdll/directory.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 60f85ed..5c163f1 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1236,7 +1236,8 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U while (res > 0) { res -= de->d_reclen; - if (!(fake_dot_dot && (!strcmp( de->d_name, "." ) || !strcmp( de->d_name, ".." ))) && + if (de->d_ino && + !(fake_dot_dot && (!strcmp( de->d_name, "." ) || !strcmp( de->d_name, ".." ))) && (info = append_entry( buffer, &io->Information, length, de->d_name, NULL, mask ))) { last_info = info;

1 0

Alexandre Julliard : configure: Re-generate with autoconf 2.63.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: abf5048bc6f038901d43c654f76f7abdf24cf715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf5048bc6f038901d43c654f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 12:56:53 2008 +0100 configure: Re-generate with autoconf 2.63. --- configure | 9537 +++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 5434 insertions(+), 4103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abf5048bc6f038901d43c…

1 0

Kirill K. Smirnov : gdi32: Fix copy/paste typo.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 003392b545580899b0cb605f4e8b3a7f9e97c33f URL: http://source.winehq.org/git/wine.git/?a=commit;h=003392b545580899b0cb605f4… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Oct 30 19:31:52 2008 +0400 gdi32: Fix copy/paste typo. --- dlls/gdi32/metafile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 6a71aa0..83ea2aa 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -913,7 +913,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT case META_DIBSTRETCHBLT: { LPBITMAPINFO info = (LPBITMAPINFO) &(mr->rdParm[10]); - LPSTR bits = (LPSTR)info + bitmap_info_size( info, mr->rdParm[2] ); + LPSTR bits = (LPSTR)info + bitmap_info_size( info, DIB_RGB_COLORS ); StretchDIBits( hdc, (SHORT)mr->rdParm[9], (SHORT)mr->rdParm[8], (SHORT)mr->rdParm[7], (SHORT)mr->rdParm[6], (SHORT)mr->rdParm[5], (SHORT)mr->rdParm[4], (SHORT)mr->rdParm[3], (SHORT)mr->rdParm[2], bits, info,

1 0

Juan Lang : crypt32: Don' t neglect status to ignore on a Windows platform when a test is todo_wine.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 97cfb3adfe073da495a78fd40912056374467211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97cfb3adfe073da495a78fd40… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 29 13:49:17 2008 -0700 crypt32: Don't neglect status to ignore on a Windows platform when a test is todo_wine. --- dlls/crypt32/tests/chain.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 7c13878..c583ed4 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1167,12 +1167,19 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected, const CERT_TRUST_STATUS *got, const CERT_TRUST_STATUS *ignore, DWORD todo, DWORD testIndex, DWORD chainIndex, DWORD elementIndex) { - if (todo & TODO_ERROR && got->dwErrorStatus != expected->dwErrorStatus) - todo_wine + if (got->dwErrorStatus == expected->dwErrorStatus) ok(got->dwErrorStatus == expected->dwErrorStatus, "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus); + else if (todo & TODO_ERROR) + todo_wine + ok(got->dwErrorStatus == expected->dwErrorStatus || + broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == + expected->dwErrorStatus), + "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", + testIndex, chainIndex, elementIndex, expected->dwErrorStatus, + got->dwErrorStatus); else ok(got->dwErrorStatus == expected->dwErrorStatus || broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == @@ -1180,12 +1187,19 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected, "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus); - if (todo & TODO_INFO && got->dwInfoStatus != expected->dwInfoStatus) - todo_wine + if (got->dwInfoStatus == expected->dwInfoStatus) ok(got->dwInfoStatus == expected->dwInfoStatus, "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", testIndex, chainIndex, elementIndex, expected->dwInfoStatus, got->dwInfoStatus); + else if (todo & TODO_INFO) + todo_wine + ok(got->dwInfoStatus == expected->dwInfoStatus || + broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == + expected->dwInfoStatus), + "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", + testIndex, chainIndex, elementIndex, expected->dwInfoStatus, + got->dwInfoStatus); else ok(got->dwInfoStatus == expected->dwInfoStatus || broken((got->dwInfoStatus & ~ignore->dwInfoStatus) ==

1 0