December 2008 - Wine-Commits

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

Dec. 18, 2008

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

Henri Verbeet : d3d9: Fix a trace.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

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

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

Dec. 18, 2008

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

Hans Leidekker : wininet: Relax a notification test.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

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

Hans Leidekker : wintrust: Implement CryptCATAdminAcquireContext.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

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 Dec. 18, 2008

Dec. 18, 2008

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 : wintrust: Open test file with share mode FILE_SHARE_READ.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

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 Dec. 18, 2008

Dec. 18, 2008

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

Alexandre Julliard : server: Use mem_size_t instead of file_pos_t for memory mapping sizes.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 29d97591564c269d2ec4d90e31c9ea1b7dde4a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d97591564c269d2ec4d90e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 19:25:49 2008 +0100 server: Use mem_size_t instead of file_pos_t for memory mapping sizes. --- dlls/ntdll/virtual.c | 12 ++++++++---- include/wine/server_protocol.h | 8 ++++---- server/mapping.c | 12 ++++++------ server/protocol.def | 8 ++++---- tools/make_requests | 3 ++- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9669b0c..bda8be1 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2210,7 +2210,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p SECTION_INHERIT inherit, ULONG alloc_type, ULONG protect ) { NTSTATUS res; - ULONGLONG full_size; + mem_size_t full_size; ACCESS_MASK access; SIZE_T size = 0; SIZE_T mask = get_mask( zero_bits ); @@ -2295,9 +2295,13 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p if (res) return res; size = full_size; - if (sizeof(size) < sizeof(full_size) && (size != full_size)) - ERR( "Sizes larger than 4Gb (%x%08x) not supported on this platform\n", - (DWORD)(full_size >> 32), (DWORD)full_size ); + if (size != full_size) + { + WARN( "Sizes larger than 4Gb (%s) not supported on this platform\n", + wine_dbgstr_longlong(full_size) ); + if (dup_mapping) NtClose( dup_mapping ); + return STATUS_INVALID_PARAMETER; + } if ((res = server_get_unix_fd( handle, 0, &unix_handle, &needs_close, NULL, NULL ))) goto done; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8860e5f..a8b4f0a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1673,7 +1673,7 @@ struct create_mapping_request struct request_header __header; unsigned int access; unsigned int attributes; - file_pos_t size; + mem_size_t size; unsigned int protect; obj_handle_t file_handle; /* VARARG(objattr,object_attributes); */ @@ -1725,7 +1725,7 @@ struct get_mapping_info_request struct get_mapping_info_reply { struct reply_header __header; - file_pos_t size; + mem_size_t size; int protect; int header_size; void* base; @@ -1744,7 +1744,7 @@ struct get_mapping_committed_range_request struct get_mapping_committed_range_reply { struct reply_header __header; - file_pos_t size; + mem_size_t size; int committed; }; @@ -1755,7 +1755,7 @@ struct add_mapping_committed_range_request struct request_header __header; obj_handle_t handle; file_pos_t offset; - file_pos_t size; + mem_size_t size; }; struct add_mapping_committed_range_reply { diff --git a/server/mapping.c b/server/mapping.c index f5df22f..0982b86 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -54,7 +54,7 @@ struct ranges struct mapping { struct object obj; /* object header */ - file_pos_t size; /* mapping size */ + mem_size_t size; /* mapping size */ int protect; /* protection flags */ struct file *file; /* file mapped */ int header_size; /* size of headers (for PE image mapping) */ @@ -199,7 +199,7 @@ static void add_committed_range( struct mapping *mapping, file_pos_t start, file } /* find the range containing start and return whether it's committed */ -static int find_committed_range( struct mapping *mapping, file_pos_t start, file_pos_t *size ) +static int find_committed_range( struct mapping *mapping, file_pos_t start, mem_size_t *size ) { unsigned int i; struct range *ranges; @@ -231,7 +231,7 @@ static int build_shared_mapping( struct mapping *mapping, int fd, IMAGE_SECTION_HEADER *sec, unsigned int nb_sec ) { unsigned int i; - file_pos_t total_size; + mem_size_t total_size; size_t file_size, map_size, max_size; off_t shared_pos, read_pos, write_pos; char *buffer = NULL; @@ -360,7 +360,7 @@ static int get_image_params( struct mapping *mapping ) } /* get the size of the unix file associated with the mapping */ -static inline int get_file_size( struct file *file, file_pos_t *size ) +static inline int get_file_size( struct file *file, mem_size_t *size ) { struct stat st; int unix_fd = get_file_unix_fd( file ); @@ -371,7 +371,7 @@ static inline int get_file_size( struct file *file, file_pos_t *size ) } static struct object *create_mapping( struct directory *root, const struct unicode_str *name, - unsigned int attr, file_pos_t size, int protect, + unsigned int attr, mem_size_t size, int protect, obj_handle_t handle, const struct security_descriptor *sd ) { struct mapping *mapping; @@ -440,7 +440,7 @@ static struct object *create_mapping( struct directory *root, const struct unico if (!(mapping->file = create_temp_file( access ))) goto error; if (!grow_file( mapping->file, size )) goto error; } - mapping->size = (size + page_mask) & ~((file_pos_t)page_mask); + mapping->size = (size + page_mask) & ~((mem_size_t)page_mask); mapping->protect = protect; return &mapping->obj; diff --git a/server/protocol.def b/server/protocol.def index afc9ace..7df2d42 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1318,7 +1318,7 @@ enum char_info_mode @REQ(create_mapping) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ - file_pos_t size; /* mapping size */ + mem_size_t size; /* mapping size */ unsigned int protect; /* protection flags (see below) */ obj_handle_t file_handle; /* file handle */ VARARG(objattr,object_attributes); /* object attributes */ @@ -1357,7 +1357,7 @@ enum char_info_mode obj_handle_t handle; /* handle to the mapping */ unsigned int access; /* wanted access rights */ @REPLY - file_pos_t size; /* mapping size */ + mem_size_t size; /* mapping size */ int protect; /* protection flags */ int header_size; /* header size (for VPROT_IMAGE mapping) */ void* base; /* default base addr (for VPROT_IMAGE mapping) */ @@ -1371,7 +1371,7 @@ enum char_info_mode obj_handle_t handle; /* handle to the mapping */ file_pos_t offset; /* starting offset (page-aligned, in bytes) */ @REPLY - file_pos_t size; /* size of range starting at offset (page-aligned, in bytes) */ + mem_size_t size; /* size of range starting at offset (page-aligned, in bytes) */ int committed; /* whether it is a committed range */ @END @@ -1380,7 +1380,7 @@ enum char_info_mode @REQ(add_mapping_committed_range) obj_handle_t handle; /* handle to the mapping */ file_pos_t offset; /* starting offset (page-aligned, in bytes) */ - file_pos_t size; /* size to set (page-aligned, in bytes) or 0 if only retrieving */ + mem_size_t size; /* size to set (page-aligned, in bytes) or 0 if only retrieving */ @END diff --git a/tools/make_requests b/tools/make_requests index b2230a2..a89bc7f 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -38,6 +38,8 @@ my %formats = "thread_id_t" => [ 4, 4, "%04x" ], "lparam_t" => [ 4, 4, "%lx" ], "apc_param_t" => [ 4, 4, "%lx" ], + "file_pos_t" => [ 8, 8, "&dump_uint64" ], + "mem_size_t" => [ 8, 8, "&dump_uint64" ], "timeout_t" => [ 8, 8, "&dump_timeout" ], "rectangle_t" => [ 16, 4, "&dump_rectangle" ], "char_info_t" => [ 4, 2, "&dump_char_info" ], @@ -46,7 +48,6 @@ my %formats = "async_data_t" => [ 24, 4, "&dump_async_data" ], "luid_t" => [ 8, 4, "&dump_luid" ], "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], - "file_pos_t" => [ 8, 8, "&dump_uint64" ], ); my @requests = ();

1 0

Alexandre Julliard : server: Make apc_param_t always 64-bit.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: a6216ab927d0a3a3ac450a570c17924c53a4534e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6216ab927d0a3a3ac450a570… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 19:43:40 2008 +0100 server: Make apc_param_t always 64-bit. --- include/wine/server_protocol.h | 4 ++-- server/async.c | 4 ++-- server/protocol.def | 2 +- server/trace.c | 32 ++++++++++++++++++++++++-------- tools/make_requests | 4 ++-- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a8b4f0a..e2166ae 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -23,7 +23,7 @@ typedef unsigned int thread_id_t; typedef unsigned int data_size_t; typedef unsigned int ioctl_code_t; typedef unsigned long lparam_t; -typedef unsigned long apc_param_t; +typedef unsigned __int64 apc_param_t; typedef unsigned __int64 mem_size_t; typedef unsigned __int64 file_pos_t; @@ -5049,6 +5049,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 350 +#define SERVER_PROTOCOL_VERSION 351 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/async.c b/server/async.c index 6dea6bc..f3186d7 100644 --- a/server/async.c +++ b/server/async.c @@ -266,8 +266,8 @@ void async_set_result( struct object *obj, unsigned int status, unsigned int tot memset( &data, 0, sizeof(data) ); data.type = APC_USER; data.user.func = async->data.apc; - data.user.args[0] = (apc_param_t)async->data.arg; - data.user.args[1] = (apc_param_t)async->data.iosb; + data.user.args[0] = (apc_param_t)(unsigned long)async->data.arg; + data.user.args[1] = (apc_param_t)(unsigned long)async->data.iosb; data.user.args[2] = 0; thread_queue_apc( async->thread, NULL, &data ); } diff --git a/server/protocol.def b/server/protocol.def index 7df2d42..e80d302 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -39,7 +39,7 @@ typedef unsigned int thread_id_t; typedef unsigned int data_size_t; typedef unsigned int ioctl_code_t; typedef unsigned long lparam_t; -typedef unsigned long apc_param_t; +typedef unsigned __int64 apc_param_t; typedef unsigned __int64 mem_size_t; typedef unsigned __int64 file_pos_t; diff --git a/server/trace.c b/server/trace.c index 59658e9..c446f63 100644 --- a/server/trace.c +++ b/server/trace.c @@ -114,8 +114,13 @@ static void dump_apc_call( const apc_call_t *call ) fprintf( stderr, "APC_NONE" ); break; case APC_USER: - fprintf( stderr, "APC_USER,args={%lx,%lx,%lx}", - call->user.args[0], call->user.args[1], call->user.args[2] ); + fprintf( stderr, "APC_USER,args={" ); + dump_uint64( &call->user.args[0] ); + fputc( ',', stderr ); + dump_uint64( &call->user.args[1] ); + fputc( ',', stderr ); + dump_uint64( &call->user.args[2] ); + fputc( '}', stderr ); break; case APC_TIMER: fprintf( stderr, "APC_TIMER,time=" ); @@ -3753,8 +3758,12 @@ static void dump_open_completion_reply( const struct open_completion_reply *req static void dump_add_completion_request( const struct add_completion_request *req ) { fprintf( stderr, " handle=%04x,", req->handle ); - fprintf( stderr, " ckey=%lx,", req->ckey ); - fprintf( stderr, " cvalue=%lx,", req->cvalue ); + fprintf( stderr, " ckey=" ); + dump_uint64( &req->ckey ); + fprintf( stderr, "," ); + fprintf( stderr, " cvalue=" ); + dump_uint64( &req->cvalue ); + fprintf( stderr, "," ); fprintf( stderr, " information=%08x,", req->information ); fprintf( stderr, " status=%08x", req->status ); } @@ -3766,8 +3775,12 @@ static void dump_remove_completion_request( const struct remove_completion_reque static void dump_remove_completion_reply( const struct remove_completion_reply *req ) { - fprintf( stderr, " ckey=%lx,", req->ckey ); - fprintf( stderr, " cvalue=%lx,", req->cvalue ); + fprintf( stderr, " ckey=" ); + dump_uint64( &req->ckey ); + fprintf( stderr, "," ); + fprintf( stderr, " cvalue=" ); + dump_uint64( &req->cvalue ); + fprintf( stderr, "," ); fprintf( stderr, " information=%08x,", req->information ); fprintf( stderr, " status=%08x", req->status ); } @@ -3786,13 +3799,16 @@ static void dump_set_completion_info_request( const struct set_completion_info_r { fprintf( stderr, " handle=%04x,", req->handle ); fprintf( stderr, " chandle=%04x,", req->chandle ); - fprintf( stderr, " ckey=%lx", req->ckey ); + fprintf( stderr, " ckey=" ); + dump_uint64( &req->ckey ); } static void dump_add_fd_completion_request( const struct add_fd_completion_request *req ) { fprintf( stderr, " handle=%04x,", req->handle ); - fprintf( stderr, " cvalue=%lx,", req->cvalue ); + fprintf( stderr, " cvalue=" ); + dump_uint64( &req->cvalue ); + fprintf( stderr, "," ); fprintf( stderr, " status=%08x,", req->status ); fprintf( stderr, " information=%08x", req->information ); } diff --git a/tools/make_requests b/tools/make_requests index a89bc7f..d21d79d 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -37,7 +37,7 @@ my %formats = "process_id_t" => [ 4, 4, "%04x" ], "thread_id_t" => [ 4, 4, "%04x" ], "lparam_t" => [ 4, 4, "%lx" ], - "apc_param_t" => [ 4, 4, "%lx" ], + "apc_param_t" => [ 8, 8, "&dump_uint64" ], "file_pos_t" => [ 8, 8, "&dump_uint64" ], "mem_size_t" => [ 8, 8, "&dump_uint64" ], "timeout_t" => [ 8, 8, "&dump_timeout" ], @@ -45,7 +45,7 @@ my %formats = "char_info_t" => [ 4, 2, "&dump_char_info" ], "apc_call_t" => [ 40, 8, "&dump_apc_call" ], "apc_result_t" => [ 40, 8, "&dump_apc_result" ], - "async_data_t" => [ 24, 4, "&dump_async_data" ], + "async_data_t" => [ 28, 8, "&dump_async_data" ], "luid_t" => [ 8, 4, "&dump_luid" ], "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], );

1 0