April 2010 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Fix multiple locales parsing in _create_locale.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: f11dfcb7a6dc7d552ef1ad7abb123268424bd357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f11dfcb7a6dc7d552ef1ad7ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:58:10 2010 +0200 msvcrt: Fix multiple locales parsing in _create_locale. --- dlls/msvcrt/locale.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e8af46b..fe36976 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -214,8 +214,8 @@ static LCID MSVCRT_locale_to_LCID(const char *locale) if(cp) { lstrcpynA(search.search_codepage, cp+1, MAX_ELEM_LEN); - if(cp-region < MAX_ELEM_LEN) - search.search_country[cp-region] = '\0'; + if(cp-region-1 < MAX_ELEM_LEN) + search.search_country[cp-region-1] = '\0'; if(cp-locale < MAX_ELEM_LEN) search.search_language[cp-locale] = '\0'; } else @@ -229,11 +229,11 @@ static LCID MSVCRT_locale_to_LCID(const char *locale) (LONG_PTR)&search); if (!search.match_flags) - return 0; + return -1; /* If we were given something that didn't match, fail */ if (search.search_country[0] && !(search.match_flags & FOUND_COUNTRY)) - return 0; + return -1; lcid = MAKELCID(search.found_lang_id, SORT_DEFAULT); @@ -253,10 +253,10 @@ static LCID MSVCRT_locale_to_LCID(const char *locale) GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, search.found_codepage, MAX_ELEM_LEN); } else - return 0; + return -1; if (!atoi(search.found_codepage)) - return 0; + return -1; } } else { /* Prefer ANSI codepages if present */ @@ -583,23 +583,25 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) return NULL; p = strchr(locale, ';'); - if(p) { + if(locale[0]=='C' && (locale[1]==';' || locale[1]=='\0')) + lcid[i] = 0; + else if(p) { memcpy(buf, locale, p-locale); lcid[i] = MSVCRT_locale_to_LCID(buf); } else lcid[i] = MSVCRT_locale_to_LCID(locale); - if(!lcid[i]) + if(lcid[i] == -1) return NULL; if(!p || *(p+1)!='L' || *(p+2)!='C' || *(p+3)!='_') break; - locale = p+4; + locale = p+1; } } else { lcid[0] = MSVCRT_locale_to_LCID(locale); - if(!lcid[0]) + if(lcid[0] == -1) return NULL; }

1 0

Piotr Caban : msvcrt: Added _vsnwprintf* implementation.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 743e6ba6886d962034b41a80e906450d97761724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743e6ba6886d962034b41a80e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:57:50 2010 +0200 msvcrt: Added _vsnwprintf* implementation. --- dlls/msvcr80/msvcr80.spec | 6 ++-- dlls/msvcr90/msvcr90.spec | 6 ++-- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 6 ++-- dlls/msvcrt/wcs.c | 67 ++++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 73 insertions(+), 14 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 02ecbfc..eb2f474 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1054,9 +1054,9 @@ @ cdecl _vsnprintf_s(ptr long long str ptr) msvcrt._vsnprintf_s @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) msvcrt._vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf -@ stub _vsnwprintf_l -@ stub _vsnwprintf_s -@ stub _vsnwprintf_s_l +@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) msvcrt._vsnwprintf_l +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) msvcrt._vsnwprintf_s +@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) msvcrt._vsnwprintf_s_l @ stub _vsprintf_l @ stub _vsprintf_p @ stub _vsprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5814fb2..7ffb0b9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1041,9 +1041,9 @@ @ cdecl _vsnprintf_s(ptr long long str ptr) msvcrt._vsnprintf_s @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) msvcrt._vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf -@ stub _vsnwprintf_l -@ stub _vsnwprintf_s -@ stub _vsnwprintf_s_l +@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) msvcrt._vsnwprintf_l +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) msvcrt._vsnwprintf_s +@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) msvcrt._vsnwprintf_s_l @ stub _vsprintf_l @ stub _vsprintf_p @ stub _vsprintf_p_l diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 81b0f4b..8d66eef 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -738,7 +738,7 @@ MSVCRT___time64_t __cdecl MSVCRT__time64(MSVCRT___time64_t*); MSVCRT_FILE* __cdecl MSVCRT__fdopen(int, const char *); MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *); int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist); -int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, unsigned int len, +int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist ); int __cdecl MSVCRT_raise(int sig); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a7070df..59ed3b3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -983,9 +983,9 @@ @ cdecl _vsnprintf_s(ptr long long str ptr) MSVCRT_vsnprintf_s @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) MSVCRT_vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf -# stub _vsnwprintf_l -# stub _vsnwprintf_s -# stub _vsnwprintf_s_l +@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnprintf_l +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) MSVCRT_vsnprintf_s +@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) MSVCRT_vsnprintf_s_l # stub _vsprintf_l # stub _vsprintf_p # stub _vsprintf_p_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4ebb0e0..652cbd7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -935,10 +935,11 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) } /********************************************************************* - * _vsnwsprintf (MSVCRT.@) + * vsnwsprintf_internal (INTERNAL) */ -int CDECL MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, - const MSVCRT_wchar_t *format, __ms_va_list valist ) +static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, BOOL valid, + __ms_va_list valist) { pf_output out; @@ -947,7 +948,65 @@ int CDECL MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, out.used = 0; out.len = len; - return pf_vsnprintf( &out, format, NULL, FALSE, valist ); + return pf_vsnprintf( &out, format, locale, valid, valist ); +} + +/********************************************************************* + * _vsnwsprintf (MSVCRT.@) + */ +int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, + const MSVCRT_wchar_t *format, __ms_va_list valist) +{ + return vsnwprintf_internal(str, len, format, NULL, FALSE, valist); +} + +/********************************************************************* + * _vsnwsprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, + __ms_va_list valist) +{ + return vsnwprintf_internal(str, len, format, locale, FALSE, valist); +} + +/********************************************************************* + * _vsnwsprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, + MSVCRT_size_t count, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + int len, ret; + + len = sizeOfBuffer/sizeof(MSVCRT_wchar_t); + if(count!=-1 && len>count+1) + len = count+1; + + ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist); + + if(ret<0 || ret==len) { + if(count!=_TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) { + MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); + *MSVCRT__errno() = MSVCRT_ERANGE; + memset(str, 0, sizeOfBuffer); + } else + str[len-1] = '\0'; + + return -1; + } + + return ret; +} + +/********************************************************************* + * _vsnwsprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_vsnwprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, + MSVCRT_size_t count, const MSVCRT_wchar_t *format, __ms_va_list valist) +{ + return MSVCRT_vsnwprintf_s_l(str, sizeOfBuffer, count, + format, NULL, valist); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added _vsnprintf* implementation.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 85fa2ee53c781563bcc1199fb38501497734d7a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85fa2ee53c781563bcc1199fb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:57:40 2010 +0200 msvcrt: Added _vsnprintf* implementation. --- dlls/msvcr80/msvcr80.spec | 10 +++--- dlls/msvcr90/msvcr90.spec | 10 +++--- dlls/msvcrt/msvcrt.h | 4 ++- dlls/msvcrt/msvcrt.spec | 10 +++--- dlls/msvcrt/wcs.c | 65 ++++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 79 insertions(+), 20 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 21367a9..02ecbfc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1048,11 +1048,11 @@ @ stub _vscwprintf_p @ stub _vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf -@ stub _vsnprintf_c -@ stub _vsnprintf_c_l -@ stub _vsnprintf_l -@ stub _vsnprintf_s -@ stub _vsnprintf_s_l +@ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf +@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) msvcrt._vsnprintf_l +@ cdecl _vsnprintf_l(ptr long str ptr ptr) msvcrt._vsnprintf_l +@ cdecl _vsnprintf_s(ptr long long str ptr) msvcrt._vsnprintf_s +@ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) msvcrt._vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf @ stub _vsnwprintf_l @ stub _vsnwprintf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d084047..5814fb2 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1035,11 +1035,11 @@ @ stub _vscwprintf_p @ stub _vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf -@ stub _vsnprintf_c -@ stub _vsnprintf_c_l -@ stub _vsnprintf_l -@ stub _vsnprintf_s -@ stub _vsnprintf_s_l +@ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf +@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) msvcrt._vsnprintf_l +@ cdecl _vsnprintf_l(ptr long str ptr ptr) msvcrt._vsnprintf_l +@ cdecl _vsnprintf_s(ptr long long str ptr) msvcrt._vsnprintf_s +@ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) msvcrt._vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf @ stub _vsnwprintf_l @ stub _vsnwprintf_s diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 2ed5aeb..81b0f4b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -707,6 +707,8 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); #define _MB_CP_ANSI -3 #define _MB_CP_LOCALE -4 +#define _TRUNCATE ((MSVCRT_size_t)-1) + void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); @@ -735,7 +737,7 @@ MSVCRT___time32_t __cdecl MSVCRT__time32(MSVCRT___time32_t*); MSVCRT___time64_t __cdecl MSVCRT__time64(MSVCRT___time64_t*); MSVCRT_FILE* __cdecl MSVCRT__fdopen(int, const char *); MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *); -int __cdecl MSVCRT_vsnprintf(char *str, unsigned int len, const char *format, __ms_va_list valist); +int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist); int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, unsigned int len, const MSVCRT_wchar_t *format, __ms_va_list valist ); int __cdecl MSVCRT_raise(int sig); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1f073d3..a7070df 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -977,11 +977,11 @@ # stub _vscwprintf_l # stub _vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf -# stub _vsnprintf_c -# stub _vsnprintf_c_l -# stub _vsnprintf_l -# stub _vsnprintf_s -# stub _vsnprintf_s_l +@ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l +@ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l +@ cdecl _vsnprintf_s(ptr long long str ptr) MSVCRT_vsnprintf_s +@ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) MSVCRT_vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf # stub _vsnwprintf_l # stub _vsnwprintf_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 7c5a19f..4ebb0e0 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -814,10 +814,10 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, } /********************************************************************* - * _vsnprintf (MSVCRT.@) + * vsnprintf_internal (INTERNAL) */ -int CDECL MSVCRT_vsnprintf( char *str, unsigned int len, - const char *format, __ms_va_list valist ) +static inline int vsnprintf_internal( char *str, MSVCRT_size_t len, const char *format, + MSVCRT__locale_t locale, BOOL valid, __ms_va_list valist ) { DWORD sz; LPWSTR formatW = NULL; @@ -833,7 +833,7 @@ int CDECL MSVCRT_vsnprintf( char *str, unsigned int len, formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); - r = pf_vsnprintf( &out, formatW, NULL, FALSE, valist ); + r = pf_vsnprintf( &out, formatW, locale, valid, valist ); HeapFree( GetProcessHeap(), 0, formatW ); @@ -841,6 +841,63 @@ int CDECL MSVCRT_vsnprintf( char *str, unsigned int len, } /********************************************************************* + * _vsnprintf (MSVCRT.@) + */ +int CDECL MSVCRT_vsnprintf( char *str, MSVCRT_size_t len, + const char *format, __ms_va_list valist ) +{ + return vsnprintf_internal(str, len, format, NULL, FALSE, valist); +} + +/********************************************************************* +* _vsnprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsnprintf_l( char *str, MSVCRT_size_t len, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + return vsnprintf_internal(str, len, format, locale, FALSE, valist); +} + +/********************************************************************* + * _vsnprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer, + MSVCRT_size_t count, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + int len, ret; + + if(sizeOfBuffer<count+1 || count==-1) + len = sizeOfBuffer; + else + len = count+1; + + ret = vsnprintf_internal(str, len, format, locale, TRUE, valist); + + if(ret<0 || ret==len) { + if(count!=_TRUNCATE && count>sizeOfBuffer) { + MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); + *MSVCRT__errno() = MSVCRT_ERANGE; + memset(str, 0, sizeOfBuffer); + } else + str[len-1] = '\0'; + + return -1; + } + + return ret; +} + +/********************************************************************* + * _vsnprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_vsnprintf_s( char *str, MSVCRT_size_t sizeOfBuffer, + MSVCRT_size_t count, const char *format, __ms_va_list valist ) +{ + return MSVCRT_vsnprintf_s_l(str,sizeOfBuffer, count, format, NULL, valist); +} + +/********************************************************************* * vsprintf (MSVCRT.@) */ int CDECL MSVCRT_vsprintf( char *str, const char *format, __ms_va_list valist)

1 0

Hans Leidekker : msi: Handle MSIDBOPEN_PATCHFILE properly in MsiOpenDatabase.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: d8504e0550243ff969ae9c392debb3e67e43c9fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8504e0550243ff969ae9c392… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:38:51 2010 +0200 msi: Handle MSIDBOPEN_PATCHFILE properly in MsiOpenDatabase. --- dlls/msi/database.c | 13 +++++++++++-- dlls/msi/tests/patch.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index fb614db..3e57792 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -262,7 +262,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) UINT ret = ERROR_FUNCTION_FAILED; LPCWSTR szMode, save_path; STATSTG stat; - BOOL created = FALSE; + BOOL created = FALSE, patch = FALSE; WCHAR path[MAX_PATH]; static const WCHAR szTables[] = { '_','T','a','b','l','e','s',0 }; @@ -277,6 +277,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) { TRACE("Database is a patch\n"); szPersist -= MSIDBOPEN_PATCHFILE; + patch = TRUE; } save_path = szDBPath; @@ -304,7 +305,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) STGM_CREATE|STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg); if( r == ERROR_SUCCESS ) { - IStorage_SetClass( stg, &CLSID_MsiDatabase ); + IStorage_SetClass( stg, patch ? &CLSID_MsiPatch : &CLSID_MsiDatabase ); /* create the _Tables stream */ r = write_stream_data(stg, szTables, NULL, 0, TRUE); if (SUCCEEDED(r)) @@ -352,6 +353,14 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) goto end; } + if ( patch && !IsEqualGUID( &stat.clsid, &CLSID_MsiPatch ) ) + { + ERR("storage GUID is not the MSI patch GUID %s\n", + debugstr_guid(&stat.clsid) ); + ret = ERROR_OPEN_FAILED; + goto end; + } + db = alloc_msiobject( MSIHANDLETYPE_DATABASE, sizeof (MSIDATABASE), MSI_CloseDatabase ); if( !db ) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 92eee6c..e889cf4 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -723,6 +723,48 @@ static void test_simple_patch( void ) RemoveDirectoryA( "msitest" ); } +static void test_MsiOpenDatabase( void ) +{ + UINT r; + MSIHANDLE hdb; + + r = MsiOpenDatabase( mspfile, MSIDBOPEN_CREATE, &hdb ); + ok(r == ERROR_SUCCESS, "failed to open database %u\n", r); + + r = MsiDatabaseCommit( hdb ); + ok(r == ERROR_SUCCESS, "failed to commit database %u\n", r); + MsiCloseHandle( hdb ); + + r = MsiOpenDatabase( mspfile, MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE, &hdb ); + ok(r == ERROR_OPEN_FAILED, "expected ERROR_OPEN_FAILED, got %u\n", r); + DeleteFileA( mspfile ); + + r = MsiOpenDatabase( mspfile, MSIDBOPEN_CREATE + MSIDBOPEN_PATCHFILE, &hdb ); + ok(r == ERROR_SUCCESS , "failed to open database %u\n", r); + + r = MsiDatabaseCommit( hdb ); + ok(r == ERROR_SUCCESS, "failed to commit database %u\n", r); + MsiCloseHandle( hdb ); + + r = MsiOpenDatabase( mspfile, MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE, &hdb ); + ok(r == ERROR_SUCCESS, "failed to open database %u\n", r); + MsiCloseHandle( hdb ); + DeleteFileA( mspfile ); + + create_database( msifile, tables, sizeof(tables) / sizeof(struct msi_table) ); + create_patch( mspfile ); + + r = MsiOpenDatabase( msifile, MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE, &hdb ); + ok(r == ERROR_OPEN_FAILED, "failed to open database %u\n", r ); + + r = MsiOpenDatabase( mspfile, MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE, &hdb ); + ok(r == ERROR_SUCCESS, "failed to open database %u\n", r ); + MsiCloseHandle( hdb ); + + DeleteFileA( msifile ); + DeleteFileA( mspfile ); +} + START_TEST(patch) { DWORD len; @@ -743,6 +785,7 @@ START_TEST(patch) get_program_files_dir( PROG_FILES_DIR, COMMON_FILES_DIR ); test_simple_patch(); + test_MsiOpenDatabase(); SetCurrentDirectoryA( prev_path ); }

1 0

Piotr Caban : msvcrt: Added implementation of __crtGetStringTypeW.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: be5a6a03a6e2c1f0a5c23eff6c475481c2d25153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5a6a03a6e2c1f0a5c23eff6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:58:19 2010 +0200 msvcrt: Added implementation of __crtGetStringTypeW. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d872571..04535b3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -148,7 +148,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW -@ stub __crtGetStringTypeW +@ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ stub __crtLCMapStringW @ stub __daylight diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 75740ec..ae13be4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -145,7 +145,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW -@ stub __crtGetStringTypeW +@ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ stub __crtLCMapStringW @ stub __daylight diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index fe36976..fe77b83 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -54,6 +54,7 @@ unsigned char charmax = CHAR_MAX; #define UNLOCK_LOCALE _munlock(_SETLOCALE_LOCK); #define MSVCRT_LEADBYTE 0x8000 +#define MSVCRT_C1_DEFINED 0x200 /* Friendly country strings & iso codes for synonym support. * Based on MS documentation for setlocale(). @@ -458,6 +459,21 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, i } /********************************************************************* + * __crtGetStringTypeW(MSVCRT.@) + * + * This function was accepting different number of arguments in older + * versions of msvcrt. + */ +BOOL CDECL __crtGetStringTypeW(DWORD unk, DWORD type, + MSVCRT_wchar_t *buffer, int len, WORD *out) +{ + FIXME("(unk %x, type %x, wstr %p(%d), %p) partial stub\n", + unk, type, buffer, len, out); + + return GetStringTypeW(type, buffer, len, out); +} + +/********************************************************************* * localeconv (MSVCRT.@) */ struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dffd749..f4f9ee8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -138,7 +138,7 @@ @ cdecl __crtCompareStringA(long long str long str long) @ cdecl __crtCompareStringW(long long wstr long wstr long) @ cdecl __crtGetLocaleInfoW(long long ptr long) -# stub __crtGetStringTypeW +@ cdecl __crtGetStringTypeW(long long wstr long ptr) @ cdecl __crtLCMapStringA(long long str long ptr long long long) # stub __crtLCMapStringW # stub __daylight

1 0

Hans Leidekker : msi: Add beginnings of a test module that concentrates on patches.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: f08c355e09009ace0c82b4dfd41d9362a68f2cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08c355e09009ace0c82b4dfd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:38:16 2010 +0200 msi: Add beginnings of a test module that concentrates on patches. --- dlls/msi/tests/Makefile.in | 1 + dlls/msi/tests/patch.c | 748 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 749 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f08c355e09009ace0c82b…

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_modify_ds_location() .
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: efb3993a3adcfce05489b62ad257da70ad1bdfe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb3993a3adcfce05489b62ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:44 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_modify_ds_location(). --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 16 +++++++--------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 547b109..1fb0dac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4513,7 +4513,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac if (Flags & WINED3DCLEAR_ZBUFFER) { /* Note that WINED3DCLEAR_ZBUFFER implies a depth stencil exists on the device */ DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; - surface_modify_ds_location(This->stencilBufferTarget, location); + surface_modify_ds_location(depth_stencil, location); } LEAVE_GL(); @@ -5920,11 +5920,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * if (This->stencilBufferTarget) { if (((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms.Flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL || ((IWineD3DSurfaceImpl *)This->stencilBufferTarget)->Flags & SFLAG_DISCARD) { - surface_modify_ds_location(This->stencilBufferTarget, SFLAG_DS_DISCARDED); + surface_modify_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, SFLAG_DS_DISCARDED); } else { struct wined3d_context *context = context_acquire(This, This->render_targets[0], CTXUSAGE_RESOURCELOAD); surface_load_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, context, SFLAG_DS_OFFSCREEN); - surface_modify_ds_location(This->stencilBufferTarget, SFLAG_DS_OFFSCREEN); + surface_modify_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, SFLAG_DS_OFFSCREEN); context_release(context); } } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 03927c9..ed641a6 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -614,7 +614,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT || This->stateBlock->renderState[WINED3DRS_ZENABLE]) surface_load_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, context, location); if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE]) - surface_modify_ds_location(This->stencilBufferTarget, location); + surface_modify_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, location); } /* Ok, we will be updating the screen from here onwards so grab the lock */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d376e28..a91acb1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4054,17 +4054,15 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, const struct wined3d_gl device->shader_backend->shader_deselect_depth_blt((IWineD3DDevice *)device); } -void surface_modify_ds_location(IWineD3DSurface *iface, DWORD location) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - - TRACE("(%p) New location %#x\n", This, location); +void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) +{ + TRACE("surface %p, new location %#x.\n", surface, location); - if (location & ~SFLAG_DS_LOCATIONS) { - FIXME("(%p) Invalid location (%#x) specified\n", This, location); - } + if (location & ~SFLAG_DS_LOCATIONS) + FIXME("Invalid location (%#x) specified.\n", location); - This->Flags &= ~SFLAG_DS_LOCATIONS; - This->Flags |= location; + surface->Flags &= ~SFLAG_DS_LOCATIONS; + surface->Flags |= location; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8c78fac..934979b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -464,7 +464,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO if (This->presentParms.Flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL || ((IWineD3DSurfaceImpl *)This->device->stencilBufferTarget)->Flags & SFLAG_DISCARD) { - surface_modify_ds_location(This->device->stencilBufferTarget, SFLAG_DS_DISCARDED); + surface_modify_ds_location((IWineD3DSurfaceImpl *)This->device->stencilBufferTarget, SFLAG_DS_DISCARDED); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 42bafca..9bcfc7f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2679,7 +2679,7 @@ void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect) DECL GLenum surface_get_gl_buffer(IWineD3DSurface *iface) DECLSPEC_HIDDEN; void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void surface_modify_ds_location(IWineD3DSurface *iface, DWORD location) DECLSPEC_HIDDEN; +void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int width, unsigned int height) DECLSPEC_HIDDEN; void surface_set_texture_name(IWineD3DSurface *iface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_is_offscreen().
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 03dc612c9c1c69aa599294bee948b0c5aeb877b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03dc612c9c1c69aa599294bee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:45 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_is_offscreen(). --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 17 ++++++++--------- dlls/wined3d/surface.c | 36 ++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 30 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03dc612c9c1c69aa59929…

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_set_compatible_renderbuffer ().
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 92a44884c7b36bf70b1abdda7460a5e2c5b4e543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a44884c7b36bf70b1abdda7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:46 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_set_compatible_renderbuffer(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/surface.c | 29 ++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1a1a69d..870ab37 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -423,7 +423,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_ unsigned int w = ((IWineD3DSurfaceImpl *)device->render_targets[0])->pow2Width; unsigned int h = ((IWineD3DSurfaceImpl *)device->render_targets[0])->pow2Height; - surface_set_compatible_renderbuffer(device->stencilBufferTarget, w, h); + surface_set_compatible_renderbuffer((IWineD3DSurfaceImpl *)device->stencilBufferTarget, w, h); } context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, (IWineD3DSurfaceImpl *)device->stencilBufferTarget, TRUE); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d2bdc9c..b7580c5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -873,15 +873,15 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct win * render target dimensions. With FBOs, the dimensions have to be an exact match. */ /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* GL locking is done by the caller */ -void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int width, unsigned int height) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info; +void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, unsigned int width, unsigned int height) +{ + const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; renderbuffer_entry_t *entry; GLuint renderbuffer = 0; unsigned int src_width, src_height; - src_width = This->pow2Width; - src_height = This->pow2Height; + src_width = surface->pow2Width; + src_height = surface->pow2Height; /* A depth stencil smaller than the render target is not valid */ if (width > src_width || height > src_height) return; @@ -890,32 +890,35 @@ void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int wi if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || (width == src_width && height == src_height)) { - This->current_renderbuffer = NULL; + surface->current_renderbuffer = NULL; return; } /* Look if we've already got a renderbuffer of the correct dimensions */ - LIST_FOR_EACH_ENTRY(entry, &This->renderbuffers, renderbuffer_entry_t, entry) { - if (entry->width == width && entry->height == height) { + LIST_FOR_EACH_ENTRY(entry, &surface->renderbuffers, renderbuffer_entry_t, entry) + { + if (entry->width == width && entry->height == height) + { renderbuffer = entry->id; - This->current_renderbuffer = entry; + surface->current_renderbuffer = entry; break; } } - if (!renderbuffer) { + if (!renderbuffer) + { gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, - This->resource.format_desc->glInternal, width, height); + surface->resource.format_desc->glInternal, width, height); entry = HeapAlloc(GetProcessHeap(), 0, sizeof(renderbuffer_entry_t)); entry->width = width; entry->height = height; entry->id = renderbuffer; - list_add_head(&This->renderbuffers, &entry->entry); + list_add_head(&surface->renderbuffers, &entry->entry); - This->current_renderbuffer = entry; + surface->current_renderbuffer = entry; } checkGLcall("set_compatible_renderbuffer"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3594dfd..a0b398a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2680,7 +2680,7 @@ GLenum surface_get_gl_buffer(IWineD3DSurface *iface) DECLSPEC_HIDDEN; void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) DECLSPEC_HIDDEN; -void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, +void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, unsigned int width, unsigned int height) DECLSPEC_HIDDEN; void surface_set_texture_name(IWineD3DSurface *iface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(IWineD3DSurface *iface, GLenum target) DECLSPEC_HIDDEN;

1 0

Kai Blin : secur32: Use NTLM2 instead of NTLMv2.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 9dd206d28e96a9e27ac7f204cab757cd3ec9db4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd206d28e96a9e27ac7f204c… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Apr 19 10:15:15 2010 +0200 secur32: Use NTLM2 instead of NTLMv2. In the current code NTLMv2 is used when talking about second generation NTLM crypto algorithms. Most other publiations call this NTLM2, and use NTLMv2 to describe a different crypto handshake that can be used by either NTLM1 or NTLM2 crypto. --- dlls/secur32/hmac_md5.c | 2 +- dlls/secur32/ntlm.c | 10 +++++----- dlls/secur32/secur32_priv.h | 6 +++--- dlls/secur32/util.c | 22 +++++++++++----------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/secur32/hmac_md5.c b/dlls/secur32/hmac_md5.c index 6dafa31..3479178 100644 --- a/dlls/secur32/hmac_md5.c +++ b/dlls/secur32/hmac_md5.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * This file implements RFC 2104 (HMAC) for the MD5 provider. - * It is needed for NTLMv2 signing and sealing. + * It is needed for NTLM2 signing and sealing. */ #include "hmac_md5.h" diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index a7330e2..0ef5b51 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -593,15 +593,15 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( MultiByteToWideChar(CP_ACP, 0, password ? password : ntlm_cred->password, password ? pwlen : ntlm_cred->pwlen, unicode_password, passwd_lenW); - SECUR32_CreateNTLMv1SessionKey((PBYTE)unicode_password, - passwd_lenW * sizeof(SEC_WCHAR), helper->session_key); + SECUR32_CreateNTLM1SessionKey((PBYTE)unicode_password, + passwd_lenW * sizeof(SEC_WCHAR), helper->session_key); HeapFree(GetProcessHeap(), 0, unicode_password); } else memset(helper->session_key, 0, 16); - /* Allocate space for a maximal string of + /* Allocate space for a maximal string of * "SF NTLMSSP_FEATURE_SIGN NTLMSSP_FEATURE_SEAL * NTLMSSP_FEATURE_SESSION_KEY" */ @@ -913,7 +913,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( helper->crypt.ntlm.a4i = SECUR32_arc4Alloc(); SECUR32_arc4Init(helper->crypt.ntlm.a4i, helper->session_key, 16); helper->crypt.ntlm.seq_num = 0l; - SECUR32_CreateNTLMv2SubKeys(helper); + SECUR32_CreateNTLM2SubKeys(helper); helper->crypt.ntlm2.send_a4i = SECUR32_arc4Alloc(); helper->crypt.ntlm2.recv_a4i = SECUR32_arc4Alloc(); SECUR32_arc4Init(helper->crypt.ntlm2.send_a4i, @@ -1471,7 +1471,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_RevertSecurityContext(PCtxtHandle phContex /*********************************************************************** * ntlm_CreateSignature * As both MakeSignature and VerifySignature need this, but different keys - * are needed for NTLMv2, the logic goes into a helper function. + * are needed for NTLM2, the logic goes into a helper function. * To ensure maximal reusability, we can specify the direction as NTLM_SEND for * signing/encrypting and NTLM_RECV for verfying/decrypting. When encrypting, * the signature is encrypted after the message was encrypted, so diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 7b4f3ff..e2b0cd0 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -138,7 +138,7 @@ void cleanup_helper(PNegoHelper helper); void check_version(PNegoHelper helper); /* Functions from base64_codec.c used elsewhere */ -SECURITY_STATUS encodeBase64(PBYTE in_buf, int in_len, char* out_buf, +SECURITY_STATUS encodeBase64(PBYTE in_buf, int in_len, char* out_buf, int max_len, int *out_len); SECURITY_STATUS decodeBase64(char *in_buf, int in_len, BYTE *out_buf, @@ -146,8 +146,8 @@ SECURITY_STATUS decodeBase64(char *in_buf, int in_len, BYTE *out_buf, /* Functions from util.c */ ULONG ComputeCrc32(const BYTE *pData, INT iLen, ULONG initial_crc); -SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE session_key); -SECURITY_STATUS SECUR32_CreateNTLMv2SubKeys(PNegoHelper helper); +SECURITY_STATUS SECUR32_CreateNTLM1SessionKey(PBYTE password, int len, PBYTE session_key); +SECURITY_STATUS SECUR32_CreateNTLM2SubKeys(PNegoHelper helper); arc4_info *SECUR32_arc4Alloc(void); void SECUR32_arc4Init(arc4_info *a4i, const BYTE *key, unsigned int keyLen); void SECUR32_arc4Process(arc4_info *a4i, BYTE *inoutString, unsigned int length); diff --git a/dlls/secur32/util.c b/dlls/secur32/util.c index a226bf5..ab52251 100644 --- a/dlls/secur32/util.c +++ b/dlls/secur32/util.c @@ -121,7 +121,7 @@ ULONG ComputeCrc32(const BYTE *pData, INT iLen, ULONG initial_crc) return ~crc; } -SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE session_key) +SECURITY_STATUS SECUR32_CreateNTLM1SessionKey(PBYTE password, int len, PBYTE session_key) { MD4_CTX ctx; BYTE ntlm_hash[16]; @@ -143,7 +143,7 @@ SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE se return SEC_E_OK; } -static void SECUR32_CalcNTLMv2Subkey(const BYTE *session_key, const char *magic, PBYTE subkey) +static void SECUR32_CalcNTLM2Subkey(const BYTE *session_key, const char *magic, PBYTE subkey) { MD5_CTX ctx; @@ -155,7 +155,7 @@ static void SECUR32_CalcNTLMv2Subkey(const BYTE *session_key, const char *magic, } /* This assumes we do have a valid NTLM2 user session key */ -SECURITY_STATUS SECUR32_CreateNTLMv2SubKeys(PNegoHelper helper) +SECURITY_STATUS SECUR32_CreateNTLM2SubKeys(PNegoHelper helper) { helper->crypt.ntlm2.send_sign_key = HeapAlloc(GetProcessHeap(), 0, 16); helper->crypt.ntlm2.send_seal_key = HeapAlloc(GetProcessHeap(), 0, 16); @@ -164,24 +164,24 @@ SECURITY_STATUS SECUR32_CreateNTLMv2SubKeys(PNegoHelper helper) if(helper->mode == NTLM_CLIENT) { - SECUR32_CalcNTLMv2Subkey(helper->session_key, client_to_server_sign_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, client_to_server_sign_constant, helper->crypt.ntlm2.send_sign_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, client_to_server_seal_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, client_to_server_seal_constant, helper->crypt.ntlm2.send_seal_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, server_to_client_sign_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, server_to_client_sign_constant, helper->crypt.ntlm2.recv_sign_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, server_to_client_seal_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, server_to_client_seal_constant, helper->crypt.ntlm2.recv_seal_key); } else { - SECUR32_CalcNTLMv2Subkey(helper->session_key, server_to_client_sign_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, server_to_client_sign_constant, helper->crypt.ntlm2.send_sign_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, server_to_client_seal_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, server_to_client_seal_constant, helper->crypt.ntlm2.send_seal_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, client_to_server_sign_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, client_to_server_sign_constant, helper->crypt.ntlm2.recv_sign_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, client_to_server_seal_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, client_to_server_seal_constant, helper->crypt.ntlm2.recv_seal_key); }

1 0