wine-commits October 2008

wine-commits@winehq.org

3 participants
1216 discussions

Henri Verbeet : wined3d: Properly break in get_argreg() (LLVM/Clang).
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: c090471a494139ae29a9ecbd086e76a651cd41ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c090471a494139ae29a9ecbd0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 30 17:38:55 2008 +0100 wined3d: Properly break in get_argreg() (LLVM/Clang). --- dlls/wined3d/arb_program_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ccb86b5..f5db127 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2611,7 +2611,10 @@ static const char *get_argreg(SHADER_BUFFER *buffer, DWORD argnum, unsigned int case 5: ret = "const5"; break; case 6: ret = "const6"; break; case 7: ret = "const7"; break; + default: ret = "unknown constant"; } + break; + default: return "unknown"; }

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

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

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

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

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

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

Juan Lang : advapi32: Print error if opening /dev/urandom fails, and update comment.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 59f2a3312e4c16876b69f9e767b1060beb88c669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f2a3312e4c16876b69f9e76… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 23 11:38:04 2008 -0700 advapi32: Print error if opening /dev/urandom fails, and update comment. --- dlls/advapi32/crypt.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 131c223..5d0b15e 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2281,11 +2281,6 @@ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen) { int dev_random; - /* FIXME: /dev/urandom does not provide random numbers of a sufficient - * quality for cryptographic applications. /dev/random is much better, - * but it blocks if the kernel has not yet collected enough entropy for - * the request, which will suspend the calling thread for an indefinite - * amount of time. */ dev_random = open("/dev/urandom", O_RDONLY); if (dev_random != -1) { @@ -2296,6 +2291,8 @@ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen) } close(dev_random); } + else + FIXME("couldn't open /dev/urandom\n"); SetLastError(NTE_FAIL); return FALSE; }

1 0

Juan Lang : crypt32: Fix some test failures on Win9x/NT4.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 3fdf6024a2cb68f95450e24802ec55ed172e20ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fdf6024a2cb68f95450e2480… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 30 10:10:09 2008 -0700 crypt32: Fix some test failures on Win9x/NT4. --- dlls/crypt32/tests/encode.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index e08a7ce..1dacc10 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -469,7 +469,8 @@ static void testTimeEncoding(DWORD dwEncoding, LPCSTR structType, } } else - ok((!ret && GetLastError() == CRYPT_E_BAD_ENCODE) || broken(ret), + ok((!ret && GetLastError() == CRYPT_E_BAD_ENCODE) || + broken(GetLastError() == ERROR_SUCCESS), "Expected CRYPT_E_BAD_ENCODE, got 0x%08x\n", GetLastError()); } @@ -498,13 +499,20 @@ static void compareTime(const SYSTEMTIME *expected, const FILETIME *got) SYSTEMTIME st; FileTimeToSystemTime(got, &st); - ok(expected->wYear == st.wYear && + ok((expected->wYear == st.wYear && expected->wMonth == st.wMonth && expected->wDay == st.wDay && expected->wHour == st.wHour && expected->wMinute == st.wMinute && expected->wSecond == st.wSecond && - abs(expected->wMilliseconds - st.wMilliseconds) <= 1, + abs(expected->wMilliseconds - st.wMilliseconds) <= 1) || + /* Some Windows systems only seem to be accurate in their time decoding to + * within about an hour. + */ + broken(expected->wYear == st.wYear && + expected->wMonth == st.wMonth && + expected->wDay == st.wDay && + abs(expected->wHour - st.wHour) <= 1), "Got unexpected value for time decoding:\nexpected %s, got %s\n", printSystemTime(expected), printFileTime(got)); } @@ -524,7 +532,8 @@ static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, if (structType == X509_CHOICE_OF_TIME || (time->sysTime.wYear >= 1950 && time->sysTime.wYear <= 2050)) { - ok(ret, "CryptDecodeObjectEx failed: %d (0x%08x)\n", GetLastError(), + ok(ret || broken(GetLastError() == OSS_DATA_ERROR), + "CryptDecodeObjectEx failed: %d (0x%08x)\n", GetLastError(), GetLastError()); if (ret) compareTime(&time->sysTime, &ft);

1 0

Juan Lang : crypt32: Fix chain error status when a cert's issuer can' t be found.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 558057b4b22dbe71f05e257294ebc2af78effb5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=558057b4b22dbe71f05e25729… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 29 14:09:43 2008 -0700 crypt32: Fix chain error status when a cert's issuer can't be found. --- dlls/crypt32/chain.c | 1 + dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index f52ac0c..e713362 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -917,6 +917,7 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, else { TRACE("Couldn't find issuer, halting chain creation\n"); + chain->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_PARTIAL_CHAIN; break; } } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index c583ed4..3d89512 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1595,7 +1595,7 @@ static ChainCheck chainCheckNoStore[] = { { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_PARTIAL_CHAIN, 0 }, 1, simpleStatus8NoStore }, - TODO_ERROR | TODO_INFO }, + TODO_INFO }, }; /* Wednesday, Oct 1, 2007 */

1 0

← Newer
1
2
3
4
5
6
7
...
122
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2008