wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Piotr Caban : msvcrt: Added _vsnprintf* implementation.
by Alexandre Julliard 19 Apr '10

19 Apr '10

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

Piotr Caban : msvcrt: Add parameters to mimic *_s function behaviour in pf_vsnprintf.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 09a32152d557ed17797fe174a64aed8a1fb8b5dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a32152d557ed17797fe174a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:57:31 2010 +0200 msvcrt: Add parameters to mimic *_s function behaviour in pf_vsnprintf. --- dlls/msvcrt/wcs.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 182af01..7c5a19f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -554,7 +554,8 @@ static void pf_fixup_exponent( char *buf ) * * implements both A and W vsnprintf functions */ -static int pf_vsnprintf( pf_output *out, const WCHAR *format, MSVCRT__locale_t locale, __ms_va_list valist ) +static int pf_vsnprintf( pf_output *out, const WCHAR *format, + MSVCRT__locale_t locale, BOOL valid, __ms_va_list valist ) { int r; LPCWSTR q, p = format; @@ -785,9 +786,20 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, MSVCRT__locale_t l r = pf_output_stringA( out, x, -1 ); if( x != number ) HeapFree( GetProcessHeap(), 0, x ); + if(r < 0) + return r; } else + { + if( valid ) + { + MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + continue; + } if( r<0 ) return r; @@ -821,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, valist ); + r = pf_vsnprintf( &out, formatW, NULL, FALSE, valist ); HeapFree( GetProcessHeap(), 0, formatW ); @@ -878,7 +890,7 @@ int CDECL MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, out.used = 0; out.len = len; - return pf_vsnprintf( &out, format, NULL, valist ); + return pf_vsnprintf( &out, format, NULL, FALSE, valist ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Format strings according to specified locale in pf_vsnprintf.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 419f902546bf741d30bce47548550a96bfa54de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=419f902546bf741d30bce4754… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:57:14 2010 +0200 msvcrt: Format strings according to specified locale in pf_vsnprintf. --- dlls/msvcrt/wcs.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e453e9c..182af01 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -554,12 +554,15 @@ static void pf_fixup_exponent( char *buf ) * * implements both A and W vsnprintf functions */ -static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valist ) +static int pf_vsnprintf( pf_output *out, const WCHAR *format, MSVCRT__locale_t locale, __ms_va_list valist ) { int r; LPCWSTR q, p = format; pf_flags flags; + if(!locale) + locale = get_locale(); + TRACE("format is %s\n",debugstr_w(format)); while (*p) { @@ -751,7 +754,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis /* deal with integers and floats using libc's printf */ else if( pf_is_valid_format( flags.Format ) ) { - char fmt[20], number[40], *x = number; + char fmt[20], number[40], *x = number, *decimal_point; /* Estimate largest possible required buffer size: * Chooses the larger of the field or precision @@ -775,6 +778,10 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis else sprintf( x, fmt, va_arg(valist, int) ); + decimal_point = strchr(x, '.'); + if(decimal_point) + *decimal_point = *locale->locinfo->lconv->decimal_point; + r = pf_output_stringA( out, x, -1 ); if( x != number ) HeapFree( GetProcessHeap(), 0, x ); @@ -814,7 +821,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, valist ); + r = pf_vsnprintf( &out, formatW, NULL, valist ); HeapFree( GetProcessHeap(), 0, formatW ); @@ -871,7 +878,7 @@ int CDECL MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, out.used = 0; out.len = len; - return pf_vsnprintf( &out, format, valist ); + return pf_vsnprintf( &out, format, NULL, valist ); } /*********************************************************************

1 0

Hans Leidekker : msi: Handle MSIDBOPEN_PATCHFILE properly in MsiOpenDatabase.
by Alexandre Julliard 19 Apr '10

19 Apr '10

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

Hans Leidekker : msi: Don't assume unversioned files are present.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 9a9faeffd8b1140dca7cce63d1b7c88ccd198b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a9faeffd8b1140dca7cce63d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:38:30 2010 +0200 msi: Don't assume unversioned files are present. --- dlls/msi/action.c | 5 ++++- dlls/msi/tests/patch.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a4af27c..fb1346b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2002,7 +2002,10 @@ static UINT msi_check_file_install_states( MSIPACKAGE *package ) msi_free( file_version ); } else - file->state = msifs_present; + { + file->state = msifs_overwrite; + comp->Cost += file->FileSize; + } } return ERROR_SUCCESS; diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 7e8d453..92eee6c 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -706,7 +706,7 @@ static void test_simple_patch( void ) } size = get_pf_file_size( "msitest\\patch.txt" ); - todo_wine ok( size == 1002, "expected 1002, got %u\n", size ); + ok( size == 1002, "expected 1002, got %u\n", size ); strcpy( path, CURR_DIR ); strcat( path, "\\" );

1 0

Hans Leidekker : msi: Add beginnings of a test module that concentrates on patches.
by Alexandre Julliard 19 Apr '10

19 Apr '10

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

Hans Leidekker : msi: Remove the string index parameter from msi_addstringW .
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 8f534055444f992bcce91f437bc8f88569729c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f534055444f992bcce91f437… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:37:38 2010 +0200 msi: Remove the string index parameter from msi_addstringW. --- dlls/msi/msipriv.h | 3 +-- dlls/msi/storages.c | 2 +- dlls/msi/streams.c | 2 +- dlls/msi/string.c | 36 +++++++++++------------------------- dlls/msi/table.c | 2 +- 5 files changed, 15 insertions(+), 30 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2b7d6ba..fada8c6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -660,8 +660,7 @@ enum StringPersistence StringNonPersistent = 1 }; -extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); - +extern BOOL msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ); diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 5b555ba..3e88874 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -77,7 +77,7 @@ static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPCWSTR name, IStorage *stg) if (!storage) return NULL; - storage->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent); + storage->str_index = msi_addstringW(sv->db->strings, name, -1, 1, StringNonPersistent); storage->storage = stg; if (storage->storage) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index e4204a2..59e845d 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -84,7 +84,7 @@ static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, ISt name = decoded; } - stream->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent); + stream->str_index = msi_addstringW(sv->db->strings, name, -1, 1, StringNonPersistent); stream->stream = stm; return stream; } diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 84f4e71..21b1db2 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -288,42 +288,28 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U return n; } -int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) +int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { + UINT n; LPWSTR str; - /* TRACE("[%2d] = %s\n", string_no, debugstr_an(data,len) ); */ - if( !data ) return 0; if( !data[0] ) return 0; - if( n > 0 ) - { - if( st->strings[n].persistent_refcount || - st->strings[n].nonpersistent_refcount ) - return -1; - } - else + + if( msi_string2idW( st, data, &n ) == ERROR_SUCCESS ) { - if( ERROR_SUCCESS == msi_string2idW( st, data, &n ) ) - { - if (persistence == StringPersistent) - st->strings[n].persistent_refcount += refcount; - else - st->strings[n].nonpersistent_refcount += refcount; - return n; - } - n = st_find_free_entry( st ); - if( n == -1 ) - return -1; + if (persistence == StringPersistent) + st->strings[n].persistent_refcount += refcount; + else + st->strings[n].nonpersistent_refcount += refcount; + return n; } - if( n < 1 ) - { - ERR("invalid index adding %s (%d)\n", debugstr_w( data ), n ); + n = st_find_free_entry( st ); + if( n == -1 ) return -1; - } /* allocate a new string */ if(len<0) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 6737ac5..3b117ae 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1383,7 +1383,7 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if ( r != ERROR_SUCCESS ) { LPCWSTR sval = MSI_RecordGetString( rec, i + 1 ); - val = msi_addstringW( tv->db->strings, 0, sval, -1, 1, + val = msi_addstringW( tv->db->strings, sval, -1, 1, persistent ? StringPersistent : StringNonPersistent ); }

1 0

Hans Leidekker : msi: Make the name parameter of create_storage and create_stream constant.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: fc15e565d308437477302695a72e8feaf2e4d955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc15e565d308437477302695a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:37:20 2010 +0200 msi: Make the name parameter of create_storage and create_stream constant. --- dlls/msi/storages.c | 2 +- dlls/msi/streams.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 144f8fd..5b555ba 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -69,7 +69,7 @@ static BOOL storages_set_table_size(MSISTORAGESVIEW *sv, UINT size) return TRUE; } -static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPWSTR name, IStorage *stg) +static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPCWSTR name, IStorage *stg) { STORAGE *storage; diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index fc660c8..e4204a2 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -68,7 +68,7 @@ static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) return TRUE; } -static STREAM *create_stream(MSISTREAMSVIEW *sv, LPWSTR name, BOOL encoded, IStream *stm) +static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, IStream *stm) { STREAM *stream; WCHAR decoded[MAX_STREAM_NAME_LEN];

1 0

Hans Leidekker : msi: Remove unused and redundant name field from STORAGE structure.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 111d33b393b359dc9a8c7a500cb2a1d9c50d9ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=111d33b393b359dc9a8c7a500… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:37:02 2010 +0200 msi: Remove unused and redundant name field from STORAGE structure. --- dlls/msi/storages.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 6a8134b..144f8fd 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -43,7 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct tabSTORAGE { UINT str_index; - LPWSTR name; IStorage *storage; } STORAGE; @@ -78,14 +77,7 @@ static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPWSTR name, IStorage *stg) if (!storage) return NULL; - storage->name = strdupW(name); - if (!storage->name) - { - msi_free(storage); - return NULL; - } - - storage->str_index = msi_addstringW(sv->db->strings, 0, storage->name, -1, 1, StringNonPersistent); + storage->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent); storage->storage = stg; if (storage->storage) @@ -436,8 +428,6 @@ static UINT STORAGES_delete(struct tagMSIVIEW *view) { if (sv->storages[i]->storage) IStorage_Release(sv->storages[i]->storage); - - msi_free(sv->storages[i]->name); msi_free(sv->storages[i]); }

1 0

Michael Stefaniuc : user32: Avoid using HIWORD on a string pointer.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 8797fb52cf7ffb8a98473bf84b0290104bb0f759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8797fb52cf7ffb8a98473bf84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 19 10:29:49 2010 +0200 user32: Avoid using HIWORD on a string pointer. --- dlls/user32/lstr.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/lstr.c b/dlls/user32/lstr.c index 8fff22f..25a935a 100644 --- a/dlls/user32/lstr.c +++ b/dlls/user32/lstr.c @@ -230,7 +230,7 @@ BOOL WINAPI OemToCharW( LPCSTR s, LPWSTR d ) */ LPSTR WINAPI CharLowerA(LPSTR str) { - if (!HIWORD(str)) + if (IS_INTRESOURCE(str)) { char ch = LOWORD(str); CharLowerBuffA( &ch, 1 ); @@ -256,7 +256,7 @@ LPSTR WINAPI CharLowerA(LPSTR str) */ LPSTR WINAPI CharUpperA(LPSTR str) { - if (!HIWORD(str)) + if (IS_INTRESOURCE(str)) { char ch = LOWORD(str); CharUpperBuffA( &ch, 1 ); @@ -282,7 +282,7 @@ LPSTR WINAPI CharUpperA(LPSTR str) */ LPWSTR WINAPI CharLowerW(LPWSTR x) { - if (HIWORD(x)) return strlwrW(x); + if (!IS_INTRESOURCE(x)) return strlwrW(x); else return (LPWSTR)((UINT_PTR)tolowerW(LOWORD(x))); } @@ -292,7 +292,7 @@ LPWSTR WINAPI CharLowerW(LPWSTR x) */ LPWSTR WINAPI CharUpperW(LPWSTR x) { - if (HIWORD(x)) return struprW(x); + if (!IS_INTRESOURCE(x)) return struprW(x); else return (LPWSTR)((UINT_PTR)toupperW(LOWORD(x))); }

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
90
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 April 2010