wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

David Adam : d3dx8: Fix the condition in D3DXMatrixIsIdentity.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 08d17fd27f63ca42a1f6ff362600b876be3a376d URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d17fd27f63ca42a1f6ff362… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Oct 30 14:18:51 2007 +0100 d3dx8: Fix the condition in D3DXMatrixIsIdentity. --- dlls/d3dx8/tests/math.c | 4 ++++ include/d3dx8math.inl | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 021dfe4..33a60dc 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -140,6 +140,10 @@ static void D3DXMatrixTest(void) expected = TRUE; got = D3DXMatrixIsIdentity(&mat); ok(expected == got, "Expected : %d, Got : %d\n", expected, got); + U(mat).m[0][0] = 0.000009f; + expected = FALSE; + got = D3DXMatrixIsIdentity(&mat); + ok(expected == got, "Expected : %d, Got : %d\n", expected, got); /* Test the NULL case */ expected = FALSE; got = D3DXMatrixIsIdentity(NULL); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 22684a0..cdcea06 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -351,7 +351,6 @@ static inline BOOL D3DXMatrixIsIdentity(D3DXMATRIX *pm) { int i,j; D3DXMATRIX testmatrix; - BOOL equal=TRUE; if ( !pm ) return FALSE; D3DXMatrixIdentity(&testmatrix); @@ -359,10 +358,10 @@ static inline BOOL D3DXMatrixIsIdentity(D3DXMATRIX *pm) { for (j=0; j<4; j++) { - if ( fabs(D3DX_U(*pm).m[i][j] - D3DX_U(testmatrix).m[i][j]) > 0.0001 ) equal = FALSE; + if ( D3DX_U(*pm).m[i][j] != D3DX_U(testmatrix).m[i][j] ) return FALSE; } } - return equal; + return TRUE; } #undef D3DX_U

1 0

Rob Shearman : advapi32: Implement filter matching for CredEnumerate.
by Alexandre Julliard 31 Oct '07

31 Oct '07

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

Rob Shearman : advapi32: Add tests for credential management functions.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: e6f28ebb1ab1e9fe23511ef1bfb203cd2e2f67d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f28ebb1ab1e9fe23511ef1b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 30 12:37:41 2007 +0000 advapi32: Add tests for credential management functions. --- dlls/advapi32/tests/Makefile.in | 1 + dlls/advapi32/tests/cred.c | 263 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 264 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6f28ebb1ab1e9fe23511…

1 0

Rob Shearman : advapi32: Implement ANSI credential management functions.
by Alexandre Julliard 31 Oct '07

31 Oct '07

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 CredEnumerateW.
by Alexandre Julliard 31 Oct '07

31 Oct '07

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 CredDeleteW.
by Alexandre Julliard 31 Oct '07

31 Oct '07

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 31 Oct '07

31 Oct '07

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 CredWriteW.
by Alexandre Julliard 31 Oct '07

31 Oct '07

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 30 Oct '07

30 Oct '07

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(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : credui: Updated Korean resource.
by Alexandre Julliard 30 Oct '07

30 Oct '07

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

← Newer
1
2
3
4
5
6
7
...
100
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 2007