October 2007 - Wine-Commits

David Adam : d3dx8: Implement D3DXMatrixMultiply.
by Alexandre Julliard Oct. 31, 2007

Oct. 31, 2007

Module: wine Branch: master Commit: c392a8bc74d23158f6dbf37df3e99212f410eb2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c392a8bc74d23158f6dbf37df… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 30 14:46:19 2007 +0100 d3dx8: Implement D3DXMatrixMultiply. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 14 ++++++++++++ dlls/d3dx8/tests/math.c | 52 +++++++++++++++++++++++++++++++++++++++++----- include/d3dx8math.h | 1 + 4 files changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index d08fb9f..808e509 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -21,7 +21,7 @@ @ stdcall D3DXVec4BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec4Transform(ptr ptr ptr) @ stdcall D3DXMatrixfDeterminant(ptr) -@ stub D3DXMatrixMultiply +@ stdcall D3DXMatrixMultiply(ptr ptr ptr) @ stub D3DXMatrixTranspose @ stub D3DXMatrixInverse @ stub D3DXMatrixScaling diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index fa1a49e..3c46581 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -44,6 +44,20 @@ FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm) return det; } +D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2) +{ + int i,j; + + for (i=0; i<4; i++) + { + for (j=0; j<4; j++) + { + pout->m[i][j] = pm1->m[i][0] * pm2->m[0][j] + pm1->m[i][1] * pm2->m[1][j] + pm1->m[i][2] * pm2->m[2][j] + pm1->m[i][3] * pm2->m[3][j]; + } + } + return pout; +} + /*_________________D3DXQUATERNION________________*/ D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index cda666a..fbfe46d 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -25,6 +25,31 @@ #define expect_color(expectedcolor,gotcolor) ok((fabs(expectedcolor.r-gotcolor.r)<admitted_error)&&(fabs(expectedcolor.g-gotcolor.g)<admitted_error)&&(fabs(expectedcolor.b-gotcolor.b)<admitted_error)&&(fabs(expectedcolor.a-gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a); +#define expect_mat(expectedmat,gotmat)\ +{ \ + int i,j,equal=1; \ + for (i=0; i<4; i++)\ + {\ + for (j=0; j<4; j++)\ + {\ + if (fabs(expectedmat.m[i][j]-gotmat.m[i][j])>admitted_error)\ + {\ + equal=0;\ + }\ + }\ + }\ + ok(equal, "Expected matrix=\n(%f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n)\n\n" \ + "Got matrix=\n(%f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f)\n", \ + expectedmat.m[0][0],expectedmat.m[0][1],expectedmat.m[0][2],expectedmat.m[0][3], \ + expectedmat.m[1][0],expectedmat.m[1][1],expectedmat.m[1][2],expectedmat.m[1][3], \ + expectedmat.m[2][0],expectedmat.m[2][1],expectedmat.m[2][2],expectedmat.m[2][3], \ + expectedmat.m[3][0],expectedmat.m[3][1],expectedmat.m[3][2],expectedmat.m[3][3], \ + gotmat.m[0][0],gotmat.m[0][1],gotmat.m[0][2],gotmat.m[0][3], \ + gotmat.m[1][0],gotmat.m[1][1],gotmat.m[1][2],gotmat.m[1][3], \ + gotmat.m[2][0],gotmat.m[2][1],gotmat.m[2][2],gotmat.m[2][3], \ + gotmat.m[3][0],gotmat.m[3][1],gotmat.m[3][2],gotmat.m[3][3]); \ +} + #define expect_vec(expectedvec,gotvec) ok((fabs(expectedvec.x-gotvec.x)<admitted_error)&&(fabs(expectedvec.y-gotvec.y)<admitted_error),"Expected Vector= (%f, %f)\n , Got Vector= (%f, %f)\n", expectedvec.x, expectedvec.y, gotvec.x, gotvec.y); #define expect_vec3(expectedvec,gotvec) ok((fabs(expectedvec.x-gotvec.x)<admitted_error)&&(fabs(expectedvec.y-gotvec.y)<admitted_error)&&(fabs(expectedvec.z-gotvec.z)<admitted_error),"Expected Vector= (%f, %f, %f)\n , Got Vector= (%f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, gotvec.x, gotvec.y, gotvec.z); @@ -123,7 +148,7 @@ static void D3DXColorTest(void) static void D3DXMatrixTest(void) { - D3DXMATRIX mat; + D3DXMATRIX expectedmat, gotmat, mat, mat2, mat3; BOOL expected, got; FLOAT expectedfloat, gotfloat; @@ -134,6 +159,13 @@ static void D3DXMatrixTest(void) U(mat).m[0][0] = 10.0f; U(mat).m[1][1] = 20.0f; U(mat).m[2][2] = 30.0f; U(mat).m[3][3] = -40.0f; + mat2.m[0][0] = 1.0f; mat2.m[1][0] = 2.0f; mat2.m[2][0] = 3.0f; + mat2.m[3][0] = 4.0f; mat2.m[0][1] = 5.0f; mat2.m[1][1] = 6.0f; + mat2.m[2][1] = 7.0f; mat2.m[3][1] = 8.0f; mat2.m[0][2] = -8.0f; + mat2.m[1][2] = -7.0f; mat2.m[2][2] = -6.0f; mat2.m[3][2] = -5.0f; + mat2.m[0][3] = -4.0f; mat2.m[1][3] = -3.0f; mat2.m[2][3] = -2.0f; + mat2.m[3][3] = -1.0f; + /*____________D3DXMatrixfDeterminant_____________*/ expectedfloat = -147888.0f; gotfloat = D3DXMatrixfDeterminant(&mat); @@ -141,20 +173,28 @@ static void D3DXMatrixTest(void) /*____________D3DXMatrixIsIdentity______________*/ expected = FALSE; - got = D3DXMatrixIsIdentity(&mat); + got = D3DXMatrixIsIdentity(&mat3); ok(expected == got, "Expected : %d, Got : %d\n", expected, got); - D3DXMatrixIdentity(&mat); + D3DXMatrixIdentity(&mat3); expected = TRUE; - got = D3DXMatrixIsIdentity(&mat); + got = D3DXMatrixIsIdentity(&mat3); ok(expected == got, "Expected : %d, Got : %d\n", expected, got); - U(mat).m[0][0] = 0.000009f; + U(mat3).m[0][0] = 0.000009f; expected = FALSE; - got = D3DXMatrixIsIdentity(&mat); + got = D3DXMatrixIsIdentity(&mat3); ok(expected == got, "Expected : %d, Got : %d\n", expected, got); /* Test the NULL case */ expected = FALSE; got = D3DXMatrixIsIdentity(NULL); ok(expected == got, "Expected : %d, Got : %d\n", expected, got); + +/*____________D3DXMatrixMultiply______________*/ + expectedmat.m[0][0] = 73.0f; expectedmat.m[0][1] = 193.0f; expectedmat.m[0][2] = -197.0f; expectedmat.m[0][3] = -77.0f; + expectedmat.m[1][0] = 231.0f; expectedmat.m[1][1] = 551.0f; expectedmat.m[1][2] = -489.0f; expectedmat.m[1][3] = -169.0; + expectedmat.m[2][0] = 239.0f; expectedmat.m[2][1] = 523.0f; expectedmat.m[2][2] = -400.0f; expectedmat.m[2][3] = -116.0f; + expectedmat.m[3][0] = -164.0f; expectedmat.m[3][1] = -320.0f; expectedmat.m[3][2] = 187.0f; expectedmat.m[3][3] = 31.0f; + D3DXMatrixMultiply(&gotmat,&mat,&mat2); + expect_mat(expectedmat,gotmat); } static void D3DXPlaneTest(void) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 9dcf0a4..94a9cfd 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -59,6 +59,7 @@ typedef struct D3DXCOLOR } D3DXCOLOR, *LPD3DXCOLOR; FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm); +D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2); D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq);

1 0

Rob Shearman : advapi32: Implement filter matching for CredEnumerate.
by Alexandre Julliard Oct. 31, 2007

Oct. 31, 2007

Module: wine Branch: master Commit: e8d7af2d4309b770b21f75fd1c10c60c275e193e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d7af2d4309b770b21f75fd1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 30 12:37:51 2007 +0000 advapi32: Implement filter matching for CredEnumerate. --- dlls/advapi32/cred.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 6c6792d..d151412 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -676,10 +676,40 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count, static BOOL credential_matches_filter(HKEY hkeyCred, LPCWSTR filter) { + LPWSTR target_name; + DWORD ret; + DWORD type; + DWORD count; + LPCWSTR p; + if (!filter) return TRUE; - FIXME("%s\n", debugstr_w(filter)); - return TRUE; + ret = RegQueryValueExW(hkeyCred, NULL, 0, &type, NULL, &count); + if (ret != ERROR_SUCCESS) + return FALSE; + else if (type != REG_SZ) + return FALSE; + + target_name = HeapAlloc(GetProcessHeap(), 0, count); + if (!target_name) + return FALSE; + ret = RegQueryValueExW(hkeyCred, NULL, 0, &type, (LPVOID)target_name, &count); + if (ret != ERROR_SUCCESS || type != REG_SZ) + { + HeapFree(GetProcessHeap(), 0, target_name); + return FALSE; + } + + TRACE("comparing filter %s to target name %s\n", debugstr_w(filter), + debugstr_w(target_name)); + + p = strchrW(filter, '*'); + ret = CompareStringW(GetThreadLocale(), 0, filter, + (p && !p[1] ? p - filter : -1), target_name, + (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; + + HeapFree(GetProcessHeap(), 0, target_name); + return ret; } /******************************************************************************

1 0

David Adam : d3dx8: Implement D3DXMatrixfDeterminant.
by Alexandre Julliard Oct. 31, 2007

Oct. 31, 2007

Module: wine Branch: master Commit: 720fb79d7f5052e7a55712be3ccc45099a0709a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=720fb79d7f5052e7a55712be3… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 30 14:30:58 2007 +0100 d3dx8: Implement D3DXMatrixfDeterminant. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 15 +++++++++++++++ dlls/d3dx8/tests/math.c | 19 +++++++++++++------ include/d3dx8math.h | 2 ++ 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index a64e1e4..d08fb9f 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -20,7 +20,7 @@ @ stdcall D3DXVec4CatmullRom(ptr ptr ptr ptr long) @ stdcall D3DXVec4BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec4Transform(ptr ptr ptr) -@ stub D3DXMatrixfDeterminant +@ stdcall D3DXMatrixfDeterminant(ptr) @ stub D3DXMatrixMultiply @ stub D3DXMatrixTranspose @ stub D3DXMatrixInverse diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index ff1b493..fa1a49e 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -29,6 +29,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx8); +/*_________________D3DXMatrix____________________*/ + +FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm) +{ + D3DXVECTOR4 minor, v1, v2, v3; + FLOAT det; + + v1.x = pm->m[0][0]; v1.y = pm->m[1][0]; v1.z = pm->m[2][0]; v1.w = pm->m[3][0]; + v2.x = pm->m[0][1]; v2.y = pm->m[1][1]; v2.z = pm->m[2][1]; v2.w = pm->m[3][1]; + v3.x = pm->m[0][2]; v3.y = pm->m[1][2]; v3.z = pm->m[2][2]; v3.w = pm->m[3][2]; + D3DXVec4Cross(&minor,&v1,&v2,&v3); + det = - (pm->m[0][3] * minor.x + pm->m[1][3] * minor.y + pm->m[2][3] * minor.z + pm->m[3][3] * minor.w); + return det; +} + /*_________________D3DXQUATERNION________________*/ D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 33a60dc..cda666a 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -125,14 +125,21 @@ static void D3DXMatrixTest(void) { D3DXMATRIX mat; BOOL expected, got; + FLOAT expectedfloat, gotfloat; + + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = 10.0f; U(mat).m[1][1] = 20.0f; U(mat).m[2][2] = 30.0f; + U(mat).m[3][3] = -40.0f; + +/*____________D3DXMatrixfDeterminant_____________*/ + expectedfloat = -147888.0f; + gotfloat = D3DXMatrixfDeterminant(&mat); + ok(fabs( gotfloat - expectedfloat ) < admitted_error, "Expected: %f, Got: %f\n", expectedfloat, gotfloat); /*____________D3DXMatrixIsIdentity______________*/ - U(mat).m[0][1] = 0.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; - U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 0.0f; U(mat).m[1][3] = 0.0f; - U(mat).m[2][0] = 0.0f; U(mat).m[2][1] = 0.0f; U(mat).m[2][3] = 0.0f; - U(mat).m[3][0] = 0.0f; U(mat).m[3][1] = 0.0f; U(mat).m[3][2] = 0.0f; - U(mat).m[0][0] = 1.0f; U(mat).m[1][1] = 1.0f; U(mat).m[2][2] = 1.0f; - U(mat).m[3][3] = 1.0f; expected = FALSE; got = D3DXMatrixIsIdentity(&mat); ok(expected == got, "Expected : %d, Got : %d\n", expected, got); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index a5fc09e..9dcf0a4 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -58,6 +58,8 @@ typedef struct D3DXCOLOR FLOAT r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; +FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm); + D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g);

1 0

Rob Shearman : advapi32: Implement ANSI credential management functions.
by Alexandre Julliard Oct. 31, 2007

Oct. 31, 2007

Module: wine Branch: master Commit: e3fae172f112ad4a2927a61434939f1106c9db84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3fae172f112ad4a2927a6143… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 30 12:37:33 2007 +0000 advapi32: Implement ANSI credential management functions. --- dlls/advapi32/advapi.c | 8 - dlls/advapi32/advapi32.spec | 8 +- dlls/advapi32/cred.c | 322 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 326 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3fae172f112ad4a2927a…

1 0

Rob Shearman : advapi32: Implement CredDeleteW.
by Alexandre Julliard Oct. 31, 2007

Oct. 31, 2007

Module: wine Branch: master Commit: 72bd876599f796f513a59112d6cc121ea6760c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=72bd876599f796f513a59112d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 30 12:37:20 2007 +0000 advapi32: Implement CredDeleteW. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/cred.c | 52 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 5de5cc2..728d754 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -103,7 +103,7 @@ # @ stub CreateTraceInstanceId @ stdcall CreateWellKnownSid(long ptr ptr ptr) # @ stub CredDeleteA -# @ stub CredDeleteW +@ stdcall CredDeleteW(wstr long long) @ stdcall CredEnumerateA(str long ptr ptr) @ stdcall CredEnumerateW(wstr long ptr ptr) @ stdcall CredFree(ptr) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 00df9b3..714d1af 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -385,6 +385,58 @@ static LPWSTR get_key_name_for_target(LPCWSTR target_name, DWORD type) } /****************************************************************************** + * CredDeleteW [ADVAPI32.@] + */ +BOOL WINAPI CredDeleteW(LPCWSTR TargetName, DWORD Type, DWORD Flags) +{ + HKEY hkeyMgr; + DWORD ret; + LPWSTR key_name; + + TRACE("(%s, %d, 0x%x)\n", debugstr_w(TargetName), Type, Flags); + + if (!TargetName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (Type != CRED_TYPE_GENERIC && Type != CRED_TYPE_DOMAIN_PASSWORD) + { + FIXME("unhandled type %d\n", Type); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (Flags) + { + FIXME("unhandled flags 0x%x\n", Flags); + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + + ret = open_cred_mgr_key(&hkeyMgr, TRUE); + if (ret != ERROR_SUCCESS) + { + WARN("couldn't open/create manager key, error %d\n", ret); + SetLastError(ERROR_NO_SUCH_LOGON_SESSION); + return FALSE; + } + + key_name = get_key_name_for_target(TargetName, Type); + ret = RegDeleteKeyW(hkeyMgr, key_name); + HeapFree(GetProcessHeap(), 0, key_name); + RegCloseKey(hkeyMgr); + if (ret != ERROR_SUCCESS) + { + SetLastError(ERROR_NOT_FOUND); + return FALSE; + } + + return TRUE; +} + +/****************************************************************************** * CredFree [ADVAPI32.@] */ VOID WINAPI CredFree(PVOID Buffer)

1 0

Rob Shearman : advapi32: Implement CredReadW and CredFree.
by Alexandre Julliard Oct. 31, 2007

Oct. 31, 2007

Module: wine Branch: master Commit: 7689fad31067e3995de7e0c9e4e2dd979382b311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7689fad31067e3995de7e0c9e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 30 12:37:14 2007 +0000 advapi32: Implement CredReadW and CredFree. --- dlls/advapi32/advapi32.spec | 4 +- dlls/advapi32/cred.c | 275 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 277 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7689fad31067e3995de7e…

1 0

Rob Shearman : advapi32: Implement CredEnumerateW.
by Alexandre Julliard Oct. 31, 2007

Oct. 31, 2007

Module: wine Branch: master Commit: 61e836b9478feb32c6d74a262646761dccc40f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e836b9478feb32c6d74a262… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 30 12:37:26 2007 +0000 advapi32: Implement CredEnumerateW. --- dlls/advapi32/advapi.c | 8 -- dlls/advapi32/cred.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 1a2c7da..9f9cf8b 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -301,11 +301,3 @@ BOOL WINAPI CredEnumerateA(LPCSTR filter, DWORD flags, DWORD *count, credentials); return FALSE; } - -BOOL WINAPI CredEnumerateW(LPCWSTR filter, DWORD flags, DWORD *count, - PCREDENTIALW **credentials) -{ - FIXME("(%s, %08x, %p, %p)\n", debugstr_w(filter), flags, count, - credentials); - return FALSE; -} diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 714d1af..39d369d 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -436,6 +436,172 @@ BOOL WINAPI CredDeleteW(LPCWSTR TargetName, DWORD Type, DWORD Flags) return TRUE; } +static BOOL credential_matches_filter(HKEY hkeyCred, LPCWSTR filter) +{ + if (!filter) return TRUE; + + FIXME("%s\n", debugstr_w(filter)); + return TRUE; +} + +/****************************************************************************** + * CredEnumerateW [ADVAPI32.@] + */ +BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, + PCREDENTIALW **Credentials) +{ + HKEY hkeyMgr; + HKEY hkeyCred; + DWORD ret; + LPWSTR target_name; + DWORD target_name_len; + DWORD len; + char *buffer; + DWORD i; + BYTE key_data[KEY_SIZE]; + + TRACE("(%s, 0x%x, %p, %p)\n", debugstr_w(Filter), Flags, Count, Credentials); + + if (Flags) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + + ret = open_cred_mgr_key(&hkeyMgr, FALSE); + if (ret != ERROR_SUCCESS) + { + WARN("couldn't open/create manager key, error %d\n", ret); + SetLastError(ERROR_NO_SUCH_LOGON_SESSION); + return FALSE; + } + + ret = get_cred_mgr_encryption_key(hkeyMgr, key_data); + if (ret != ERROR_SUCCESS) + { + RegCloseKey(hkeyMgr); + SetLastError(ret); + return FALSE; + } + + ret = RegQueryInfoKeyW(hkeyMgr, NULL, NULL, NULL, NULL, &target_name_len, NULL, NULL, NULL, NULL, NULL, NULL); + if (ret != ERROR_SUCCESS) + { + RegCloseKey(hkeyMgr); + SetLastError(ret); + return FALSE; + } + + target_name = HeapAlloc(GetProcessHeap(), 0, (target_name_len+1)*sizeof(WCHAR)); + if (!target_name) + { + RegCloseKey(hkeyMgr); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + *Count = 0; + len = 0; + for (i = 0;; i++) + { + ret = RegEnumKeyW(hkeyMgr, i, target_name, target_name_len+1); + if (ret == ERROR_NO_MORE_ITEMS) + { + ret = ERROR_SUCCESS; + break; + } + else if (ret != ERROR_SUCCESS) + { + ret = ERROR_SUCCESS; + continue; + } + ret = RegOpenKeyExW(hkeyMgr, target_name, 0, KEY_QUERY_VALUE, &hkeyCred); + if (ret != ERROR_SUCCESS) + { + ret = ERROR_SUCCESS; + continue; + } + if (!credential_matches_filter(hkeyCred, Filter)) + { + RegCloseKey(hkeyCred); + continue; + } + len += sizeof(CREDENTIALW); + ret = read_credential(hkeyCred, NULL, key_data, NULL, &len); + RegCloseKey(hkeyCred); + if (ret != ERROR_SUCCESS) break; + (*Count)++; + } + if (ret == ERROR_SUCCESS && *Count == 0) + ret = ERROR_NOT_FOUND; + if (ret != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, target_name); + RegCloseKey(hkeyMgr); + SetLastError(ret); + return FALSE; + } + len += *Count + sizeof(PCREDENTIALW); + + if (ret == ERROR_SUCCESS) + { + buffer = HeapAlloc(GetProcessHeap(), 0, len); + *Credentials = (PCREDENTIALW *)buffer; + if (buffer) + { + buffer += *Count * sizeof(PCREDENTIALW); + *Count = 0; + for (i = 0;; i++) + { + ret = RegEnumKeyW(hkeyMgr, i, target_name, target_name_len+1); + if (ret == ERROR_NO_MORE_ITEMS) + { + ret = ERROR_SUCCESS; + break; + } + else if (ret != ERROR_SUCCESS) + { + ret = ERROR_SUCCESS; + continue; + } + TRACE("target_name = %s\n", debugstr_w(target_name)); + ret = RegOpenKeyExW(hkeyMgr, target_name, 0, KEY_QUERY_VALUE, &hkeyCred); + if (ret != ERROR_SUCCESS) + { + ret = ERROR_SUCCESS; + continue; + } + if (!credential_matches_filter(hkeyCred, Filter)) + { + RegCloseKey(hkeyCred); + continue; + } + len = sizeof(CREDENTIALW); + (*Credentials)[*Count] = (PCREDENTIALW)buffer; + ret = read_credential(hkeyCred, (*Credentials)[*Count], + key_data, + buffer + sizeof(CREDENTIALW), &len); + RegCloseKey(hkeyCred); + if (ret != ERROR_SUCCESS) break; + buffer += len; + (*Count)++; + } + } + else + ret = ERROR_OUTOFMEMORY; + } + + HeapFree(GetProcessHeap(), 0, target_name); + RegCloseKey(hkeyMgr); + + if (ret != ERROR_SUCCESS) + { + SetLastError(ret); + return FALSE; + } + return TRUE; +} + /****************************************************************************** * CredFree [ADVAPI32.@] */

1 0

Rob Shearman : advapi32: Implement CredWriteW.
by Alexandre Julliard Oct. 31, 2007

Oct. 31, 2007

Module: wine Branch: master Commit: 7583130908811dc93ed07c8f40066043a00bc3cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7583130908811dc93ed07c8f4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 30 12:36:59 2007 +0000 advapi32: Implement CredWriteW. --- dlls/advapi32/Makefile.in | 1 + dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/cred.c | 293 +++++++++++++++++++++++++++++++++++++++++++ dlls/advapi32/crypt.h | 2 + 4 files changed, 297 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7583130908811dc93ed07…

1 0

Alexandre Julliard : server: Add the generated files missing from the last commit.
by Alexandre Julliard Oct. 30, 2007

Oct. 30, 2007

Module: wine Branch: master Commit: 94c976c97a38347fde330b2fdba949b786b9479a URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c976c97a38347fde330b2fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 15:32:40 2007 +0100 server: Add the generated files missing from the last commit. --- include/wine/server_protocol.h | 4 +++- server/trace.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e7ce2cb..e669953 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -221,6 +221,7 @@ struct object_attributes { obj_handle_t rootdir; data_size_t sd_len; + data_size_t name_len; }; @@ -1010,6 +1011,7 @@ struct create_file_request int create; unsigned int options; unsigned int attrs; + /* VARARG(objattr,object_attributes); */ /* VARARG(filename,string); */ }; struct create_file_reply @@ -4877,6 +4879,6 @@ union generic_reply struct set_completion_info_reply set_completion_info_reply; }; -#define SERVER_PROTOCOL_VERSION 321 +#define SERVER_PROTOCOL_VERSION 323 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/trace.c b/server/trace.c index 0f0e17d..72f9ddb 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1275,6 +1275,9 @@ static void dump_create_file_request( const struct create_file_request *req ) fprintf( stderr, " create=%d,", req->create ); fprintf( stderr, " options=%08x,", req->options ); fprintf( stderr, " attrs=%08x,", req->attrs ); + fprintf( stderr, " objattr=" ); + dump_varargs_object_attributes( cur_size ); + fputc( ',', stderr ); fprintf( stderr, " filename=" ); dump_varargs_string( cur_size ); }

1 0

Hwang YunSong(황윤성) : credui: Updated Korean resource.
by Alexandre Julliard Oct. 30, 2007

Oct. 30, 2007

Module: wine Branch: master Commit: 604530e3bde04e0b1173a848f17407da0c7b67f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604530e3bde04e0b1173a848f… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Oct 30 10:16:10 2007 +0900 credui: Updated Korean resource. --- dlls/credui/credui_Ko.rc | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_Ko.rc b/dlls/credui/credui_Ko.rc index 67daa0d..3208af1 100644 --- a/dlls/credui/credui_Ko.rc +++ b/dlls/credui/credui_Ko.rc @@ -34,8 +34,15 @@ BEGIN CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,12 LTEXT "��ȣ(&P):",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Remember my password",IDC_SAVE,"Button", + CONTROL "�� ȣ ��(&R)",IDC_SAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 DEFPUSHBUTTON "Ȯ��",IDOK,97,128,50,14 PUSHBUTTON "��",IDCANCEL,156,128,50,14 END + + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT " %s ��" + IDS_MESSAGEFORMAT " %s ��" +}

1 0