December 2008 - Wine-commits

Jacek Caban : urlmon: Remove broken IBindCtx ref count test.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: b316ce3c050a8eec726990c5ca8a74f99901c02d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b316ce3c050a8eec726990c5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 17 14:41:47 2008 +0100 urlmon: Remove broken IBindCtx ref count test. --- dlls/urlmon/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 631127b..830ef1a 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2321,7 +2321,7 @@ static void test_BindToObject(int protocol, BOOL emul) todo_wine ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); if(bindf & BINDF_ASYNCHRONOUS) - ok(IBindCtx_Release(bctx) != 0, "bctx should not be destroyed here\n"); + IBindCtx_Release(bctx); else todo_wine ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); }

1 0

Henri Verbeet : d3d9: Fix a trace.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 42036ab6f57df0fd0da5582b4bd9e85d8b098c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=42036ab6f57df0fd0da5582b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 17 17:07:24 2008 +0100 d3d9: Fix a trace. --- dlls/d3d9/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 22e1926..30b42c5 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -188,6 +188,6 @@ HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(LPDIRECT3DDEVICE9EX iface, I IDirect3DDevice9Ex_AddRef(iface); object->parentDevice = iface; *ppSB=(IDirect3DStateBlock9*)object; - TRACE("(%p)Returning %p %p\n", This, *ppSB, wineD3DStateBlock); + TRACE("(%p) Returning *ppSB %p, wineD3DStateBlock %p\n", This, *ppSB, wineD3DStateBlock); return D3D_OK; }

1 0

Henri Verbeet : d3d9: Add a test for shader constant application through IDirect3DStateBlock9_Apply ().
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: c889bab8e640778cb07a3ecb756df069dee9a0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c889bab8e640778cb07a3ecb7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 17 17:07:24 2008 +0100 d3d9: Add a test for shader constant application through IDirect3DStateBlock9_Apply(). We already behave correctly here, the test just verifies it. --- dlls/d3d9/tests/stateblock.c | 105 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index f676c3c..f8ee57d 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -1459,6 +1459,110 @@ static void test_state_management( execute_test_chain_all(device, tests, tcount); } +static void test_shader_constant_apply(IDirect3DDevice9 *device) +{ + static const float initial[] = {0.0f, 0.0f, 0.0f, 0.0f}; + static const float vs_const[] = {1.0f, 2.0f, 3.0f, 4.0f}; + static const float ps_const[] = {5.0f, 6.0f, 7.0f, 8.0f}; + IDirect3DStateBlock9 *stateblock; + float ret[4]; + HRESULT hr; + + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, initial, 1); + ok(SUCCEEDED(hr), "SetVertexShaderConstantF returned %#x\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 1, initial, 1); + ok(SUCCEEDED(hr), "SetVertexShaderConstantF returned %#x\n", hr); + hr = IDirect3DDevice9_SetPixelShaderConstantF(device, 0, initial, 1); + ok(SUCCEEDED(hr), "SetPixelShaderConstantF returned %#x\n", hr); + hr = IDirect3DDevice9_SetPixelShaderConstantF(device, 1, initial, 1); + ok(SUCCEEDED(hr), "SetPixelShaderConstantF returned %#x\n", hr); + + hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 0, ret, 1); + ok(SUCCEEDED(hr), "GetVertexShaderConstantF returned %#x\n", hr); + ok(!memcmp(ret, initial, sizeof(initial)), + "GetVertexShaderConstantF got {%f, %f, %f, %f}, expected {%f, %f, %f, %f}\n", + ret[0], ret[1], ret[2], ret[3], initial[0], initial[1], initial[2], initial[3]); + hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 1, ret, 1); + ok(SUCCEEDED(hr), "GetVertexShaderConstantF returned %#x\n", hr); + ok(!memcmp(ret, initial, sizeof(initial)), + "GetVertexShaderConstantF got {%f, %f, %f, %f}, expected {%f, %f, %f, %f}\n", + ret[0], ret[1], ret[2], ret[3], initial[0], initial[1], initial[2], initial[3]); + hr = IDirect3DDevice9_GetPixelShaderConstantF(device, 0, ret, 1); + ok(SUCCEEDED(hr), "GetPixelShaderConstantF returned %#x\n", hr); + ok(!memcmp(ret, initial, sizeof(initial)), + "GetpixelShaderConstantF got {%f, %f, %f, %f}, expected {%f, %f, %f, %f}\n", + ret[0], ret[1], ret[2], ret[3], initial[0], initial[1], initial[2], initial[3]); + hr = IDirect3DDevice9_GetPixelShaderConstantF(device, 1, ret, 1); + ok(SUCCEEDED(hr), "GetPixelShaderConstantF returned %#x\n", hr); + ok(!memcmp(ret, initial, sizeof(initial)), + "GetPixelShaderConstantF got {%f, %f, %f, %f}, expected {%f, %f, %f, %f}\n", + ret[0], ret[1], ret[2], ret[3], initial[0], initial[1], initial[2], initial[3]); + + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, vs_const, 1); + ok(SUCCEEDED(hr), "SetVertexShaderConstantF returned %#x\n", hr); + hr = IDirect3DDevice9_SetPixelShaderConstantF(device, 0, ps_const, 1); + ok(SUCCEEDED(hr), "SetPixelShaderConstantF returned %#x\n", hr); + + hr = IDirect3DDevice9_BeginStateBlock(device); + ok(SUCCEEDED(hr), "BeginStateBlock returned %#x\n", hr); + + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 1, vs_const, 1); + ok(SUCCEEDED(hr), "SetVertexShaderConstantF returned %#x\n", hr); + hr = IDirect3DDevice9_SetPixelShaderConstantF(device, 1, ps_const, 1); + ok(SUCCEEDED(hr), "SetPixelShaderConstantF returned %#x\n", hr); + + hr = IDirect3DDevice9_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "EndStateBlock returned %#x\n", hr); + + hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 0, ret, 1); + ok(SUCCEEDED(hr), "GetVertexShaderConstantF returned %#x\n", hr); + ok(!memcmp(ret, vs_const, sizeof(vs_const)), + "GetVertexShaderConstantF got {%f, %f, %f, %f}, expected {%f, %f, %f, %f}\n", + ret[0], ret[1], ret[2], ret[3], vs_const[0], vs_const[1], vs_const[2], vs_const[3]); + hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 1, ret, 1); + ok(SUCCEEDED(hr), "GetVertexShaderConstantF returned %#x\n", hr); + ok(!memcmp(ret, initial, sizeof(initial)), + "GetVertexShaderConstantF got {%f, %f, %f, %f}, expected {%f, %f, %f, %f}\n", + ret[0], ret[1], ret[2], ret[3], initial[0], initial[1], initial[2], initial[3]); + hr = IDirect3DDevice9_GetPixelShaderConstantF(device, 0, ret, 1); + ok(SUCCEEDED(hr), "GetPixelShaderConstantF returned %#x\n", hr); + ok(!memcmp(ret, ps_const, sizeof(ps_const)), + "GetPixelShaderConstantF got {%f, %f, %f, %f}, expected {%f, %f, %f, %f}\n", + ret[0], ret[1], ret[2], ret[3], ps_const[0], ps_const[1], ps_const[2], ps_const[3]); + hr = IDirect3DDevice9_GetPixelShaderConstantF(device, 1, ret, 1); + ok(SUCCEEDED(hr), "GetPixelShaderConstantF returned %#x\n", hr); + ok(!memcmp(ret, initial, sizeof(initial)), + "GetPixelShaderConstantF got {%f, %f, %f, %f}, expected {%f, %f, %f, %f}\n", + ret[0], ret[1], ret[2], ret[3], initial[0], initial[1], initial[2], initial[3]); + + hr = IDirect3DStateBlock9_Apply(stateblock); + ok(SUCCEEDED(hr), "Apply returned %#x\n", hr); + + /* Apply doesn't overwrite constants that aren't explicitly set on the source stateblock. */ + hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 0, ret, 1); + ok(SUCCEEDED(hr), "GetVertexShaderConstantF returned %#x\n", hr); + ok(!memcmp(ret, vs_const, sizeof(vs_const)), + "GetVertexShaderConstantF got {%f, %f, %f, %f}, expected {%f, %f, %f, %f}\n", + ret[0], ret[1], ret[2], ret[3], vs_const[0], vs_const[1], vs_const[2], vs_const[3]); + hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 1, ret, 1); + ok(SUCCEEDED(hr), "GetVertexShaderConstantF returned %#x\n", hr); + ok(!memcmp(ret, vs_const, sizeof(vs_const)), + "GetVertexShaderConstantF got {%f, %f, %f, %f}, expected {%f, %f, %f, %f}\n", + ret[0], ret[1], ret[2], ret[3], vs_const[0], vs_const[1], vs_const[2], vs_const[3]); + hr = IDirect3DDevice9_GetPixelShaderConstantF(device, 0, ret, 1); + ok(SUCCEEDED(hr), "GetPixelShaderConstantF returned %#x\n", hr); + ok(!memcmp(ret, ps_const, sizeof(ps_const)), + "GetPixelShaderConstantF got {%f, %f, %f, %f}, expected {%f, %f, %f, %f}\n", + ret[0], ret[1], ret[2], ret[3], ps_const[0], ps_const[1], ps_const[2], ps_const[3]); + hr = IDirect3DDevice9_GetPixelShaderConstantF(device, 1, ret, 1); + ok(SUCCEEDED(hr), "GetPixelShaderConstantF returned %#x\n", hr); + ok(!memcmp(ret, ps_const, sizeof(ps_const)), + "GetPixelShaderConstantF got {%f, %f, %f, %f}, expected {%f, %f, %f, %f}\n", + ret[0], ret[1], ret[2], ret[3], ps_const[0], ps_const[1], ps_const[2], ps_const[3]); + + IDirect3DStateBlock9_Release(stateblock); +} + START_TEST(stateblock) { IDirect3DDevice9 *device_ptr = NULL; @@ -1477,6 +1581,7 @@ START_TEST(stateblock) test_begin_end_state_block(device_ptr); test_state_management(device_ptr, &device_pparams); + test_shader_constant_apply(device_ptr); if (device_ptr) IUnknown_Release(device_ptr); }

1 0

Hans Leidekker : wintrust: Open test file with share mode FILE_SHARE_READ.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 0b0621c8cbb1750e64e8fe70eb346a18c87a61ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0621c8cbb1750e64e8fe70e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 17 14:32:35 2008 +0100 wintrust: Open test file with share mode FILE_SHARE_READ. --- dlls/wintrust/tests/crypt.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index a45f853..eaec81d 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -285,10 +285,11 @@ static void test_calchash(void) CloseHandle(file); /* All OK, requesting the size of the hash */ - file = CreateFileA(selfname, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + file = CreateFileA(selfname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, NULL, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success %u\n", GetLastError()); todo_wine { ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); @@ -300,12 +301,12 @@ static void test_calchash(void) /* All OK, retrieve the hash * Double the hash buffer to see what happens to the size parameter */ - file = CreateFileA(selfname, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + file = CreateFileA(selfname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); hashsize *= 2; hash = HeapAlloc(GetProcessHeap(), 0, hashsize); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success %u\n", GetLastError()); todo_wine { ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize);

1 0

Hans Leidekker : wintrust: Don't test last error on success.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 976341a45e94b3a9374b7fb87bed9d69643132cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=976341a45e94b3a9374b7fb87… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 17 14:32:51 2008 +0100 wintrust: Don't test last error on success. --- dlls/wintrust/tests/crypt.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index eaec81d..54c7fda 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -102,12 +102,8 @@ static void test_context(void) "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* NULL GUID */ - SetLastError(0xdeadbeef); ret = pCryptCATAdminAcquireContext(&hca, NULL, 0); ok(ret, "Expected success\n"); - ok(GetLastError() == ERROR_SUCCESS || - GetLastError() == 0xdeadbeef /* Vista */, - "Expected ERROR_SUCCESS or 0xdeadbeef, got %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); /* All NULL */ @@ -154,12 +150,8 @@ static void test_context(void) * save to remove files and directories from CatRoot/CatRoot2. */ - SetLastError(0xdeadbeef); ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0); ok(ret, "Expected success\n"); - ok(GetLastError() == ERROR_SUCCESS || - GetLastError() == 0xdeadbeef /* Vista */, - "Expected ERROR_SUCCESS or 0xdeadbeef, got %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); GetWindowsDirectoryA(windir, MAX_PATH); @@ -199,24 +191,16 @@ static void test_context(void) ok(ret, "Expected success\n"); /* Correct context handle and GUID */ - SetLastError(0xdeadbeef); ret = pCryptCATAdminAcquireContext(&hca, &unknown, 0); ok(ret, "Expected success\n"); - ok(GetLastError() == ERROR_SUCCESS || - GetLastError() == 0xdeadbeef /* Vista */, - "Expected ERROR_SUCCESS or 0xdeadbeef, got %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); ret = pCryptCATAdminReleaseContext(hca, 0); ok(ret, "Expected success\n"); /* Flags not equal to 0 */ - SetLastError(0xdeadbeef); ret = pCryptCATAdminAcquireContext(&hca, &unknown, 1); ok(ret, "Expected success\n"); - ok(GetLastError() == ERROR_SUCCESS || - GetLastError() == 0xdeadbeef /* Vista */, - "Expected ERROR_SUCCESS or 0xdeadbeef, got %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); ret = pCryptCATAdminReleaseContext(hca, 0);

1 0

Hans Leidekker : wintrust: Implement CryptCATAdminAcquireContext.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 1d9ce08ce2449c5327e1968d9cc15065a3a6fd07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9ce08ce2449c5327e1968d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 17 14:33:07 2008 +0100 wintrust: Implement CryptCATAdminAcquireContext. Based on work done by Maarten Lankhorst. --- dlls/wintrust/crypt.c | 52 ++++++++++++++++++++++++++++++++++++++---- dlls/wintrust/tests/crypt.c | 9 ++----- 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 33cc6de..bbdf2c0 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -32,9 +32,18 @@ #include "imagehlp.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wintrust); +#define CATADMIN_MAGIC 0x43415441 /* 'CATA' */ + +struct catadmin +{ + DWORD magic; + WCHAR path[MAX_PATH]; +}; + /*********************************************************************** * CryptCATAdminAcquireContext (WINTRUST.@) * @@ -42,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust); * * PARAMS * catAdmin [O] Pointer to the context handle. - * sysSystem [I] Pointer to a GUID for the needed subsystem. + * sys [I] Pointer to a GUID for the needed subsystem. * dwFlags [I] Reserved. * * RETURNS @@ -50,19 +59,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust); * Failure: FALSE. * */ -BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin, - const GUID *sysSystem, DWORD dwFlags ) +BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN *catAdmin, + const GUID *sys, DWORD dwFlags) { - FIXME("%p %s %x\n", catAdmin, debugstr_guid(sysSystem), dwFlags); + static const WCHAR catroot[] = + {'\\','c','a','t','r','o','o','t',0}; + static const WCHAR fmt[] = + {'%','s','\\','{','%','0','8','x','-','%','0','4','x','-','%','0', + '4','x','-','%','0','2','x','%','0','2','x','-','%','0','2','x', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x', + '%','0','2','x','}',0}; + static const GUID defsys = + {0x127d0a1d,0x4ef2,0x11d1,{0x86,0x08,0x00,0xc0,0x4f,0xc2,0x95,0xee}}; + + WCHAR catroot_dir[MAX_PATH]; + struct catadmin *ca; + + TRACE("%p %s %x\n", catAdmin, debugstr_guid(sys), dwFlags); if (!catAdmin) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + if (!(ca = HeapAlloc(GetProcessHeap(), 0, sizeof(*ca)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + GetSystemDirectoryW(catroot_dir, MAX_PATH); + strcatW(catroot_dir, catroot); + + /* create the directory if it doesn't exist */ + CreateDirectoryW(catroot_dir, NULL); + + if (!sys) sys = &defsys; + sprintfW(ca->path, fmt, catroot_dir, sys->Data1, sys->Data2, + sys->Data3, sys->Data4[0], sys->Data4[1], sys->Data4[2], + sys->Data4[3], sys->Data4[4], sys->Data4[5], sys->Data4[6], + sys->Data4[7]); - *catAdmin = (HCATADMIN)0xdeadbeef; + /* create the directory if it doesn't exist */ + CreateDirectoryW(ca->path, NULL); + ca->magic = CATADMIN_MAGIC; + *catAdmin = ca; return TRUE; } diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 54c7fda..e09f5fe 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -164,17 +164,14 @@ static void test_context(void) /* On a clean Wine this will fail. When a native wintrust.dll was used in the past * some tests will succeed. */ - todo_wine - ok(attrs != INVALID_FILE_ATTRIBUTES, - "Expected the CatRoot directory to exist\n"); + ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected the CatRoot directory to exist\n"); /* Windows creates the GUID directory in capitals */ lstrcpyA(dummydir, catroot); lstrcatA(dummydir, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"); attrs = GetFileAttributes(dummydir); - todo_wine - ok(attrs != INVALID_FILE_ATTRIBUTES, - "Expected CatRoot\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n"); + ok(attrs != INVALID_FILE_ATTRIBUTES, + "Expected CatRoot\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n"); /* Only present on XP or higher. */ attrs = GetFileAttributes(catroot2);

1 0

Hans Leidekker : wintrust: Implement CryptCATAdminReleaseContext.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: a99ef3570f49375ad6edf35f9b31ac0cf1de3b6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a99ef3570f49375ad6edf35f9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 17 14:33:29 2008 +0100 wintrust: Implement CryptCATAdminReleaseContext. Based on work done by Maarten Lankhorst. --- dlls/wintrust/crypt.c | 13 +++++++++++-- dlls/wintrust/tests/crypt.c | 6 ------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index bbdf2c0..b69647d 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -183,8 +183,17 @@ BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN hCatAdmin, */ BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) { - FIXME("%p %x\n", hCatAdmin, dwFlags); - return TRUE; + struct catadmin *ca = hCatAdmin; + + TRACE("%p %x\n", hCatAdmin, dwFlags); + + if (!ca || ca->magic != CATADMIN_MAGIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + ca->magic = 0; + return HeapFree(GetProcessHeap(), 0, ca); } /*********************************************************************** diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index e09f5fe..af78051 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -109,12 +109,9 @@ static void test_context(void) /* All NULL */ SetLastError(0xdeadbeef); ret = pCryptCATAdminReleaseContext(NULL, 0); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } /* Proper release */ SetLastError(0xdeadbeef); @@ -126,12 +123,9 @@ static void test_context(void) /* Try to release a second time */ SetLastError(0xdeadbeef); ret = pCryptCATAdminReleaseContext(hca, 0); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } /* NULL context handle and dummy GUID */ SetLastError(0xdeadbeef);

1 0

Hans Leidekker : wininet: Relax a notification test.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 1791471bbf4c0403f699b8ac80cfd5f19d4129bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1791471bbf4c0403f699b8ac8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 17 14:33:49 2008 +0100 wininet: Relax a notification test. --- dlls/wininet/tests/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6554680..8b3a8f8 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -325,8 +325,8 @@ static void InternetReadFile_test(int flags) SET_EXPECT2(INTERNET_STATUS_REQUEST_SENT, 2); SET_EXPECT2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); SET_EXPECT2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); - SET_EXPECT2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - SET_EXPECT2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + SET_OPTIONAL2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + SET_OPTIONAL2(INTERNET_STATUS_CONNECTION_CLOSED, 2); SET_EXPECT(INTERNET_STATUS_REDIRECT); SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER);

1 0

Alexandre Julliard : server: Add a mem_size_t type to represent memory sizes and offsets.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 992d3cea936e52cac0540f1db1a2b2253a8c9105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992d3cea936e52cac0540f1db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 19:24:33 2008 +0100 server: Add a mem_size_t type to represent memory sizes and offsets. --- include/wine/server_protocol.h | 35 ++++++++++++++++++----------------- server/protocol.def | 35 ++++++++++++++++++----------------- 2 files changed, 36 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=992d3cea936e52cac0540…

1 0

Alexandre Julliard : server: Make mem_size_t always 64-bit.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 401f4b717a1ae46313f7d033952efd2395099941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=401f4b717a1ae46313f7d0339… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 19:25:09 2008 +0100 server: Make mem_size_t always 64-bit. --- dlls/ntdll/sync.c | 128 +++++++++++++++++++++++++-------------- dlls/ntdll/virtual.c | 2 + include/wine/server_protocol.h | 4 +- server/protocol.def | 2 +- server/trace.c | 130 +++++++++++++++++++++------------------ tools/make_requests | 8 +- 6 files changed, 162 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=401f4b717a1ae46313f7d…

1 0