June 2010 - Wine-commits - list.winehq.org

David Hedberg : include: Add PIDLIST_ABSOLUTE typedef.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 4a47033a864436bd07189ec9daa9789589fb2185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a47033a864436bd07189ec9d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Jun 11 13:19:49 2010 +0200 include: Add PIDLIST_ABSOLUTE typedef. --- include/shtypes.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/shtypes.idl b/include/shtypes.idl index 5ed8daf..41aa236 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -39,6 +39,7 @@ typedef const PITEMID_CHILD PCITEMID_CHILD; typedef LPCITEMIDLIST PCUITEMID_CHILD; typedef LPCITEMIDLIST *PCUITEMID_CHILD_ARRAY; typedef LPCITEMIDLIST PCUIDLIST_RELATIVE; +typedef LPITEMIDLIST PIDLIST_ABSOLUTE; typedef LPCITEMIDLIST PCIDLIST_ABSOLUTE; cpp_quote("#include <poppack.h>")

1 0

David Hedberg : include: Add extended treeview style (TVS_EX_) definitions.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 341daad86152a36dcfa473c6979f99f947d11ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=341daad86152a36dcfa473c69… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Jun 11 13:19:50 2010 +0200 include: Add extended treeview style (TVS_EX_) definitions. --- include/commctrl.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 27bd745..56f0029 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2463,6 +2463,16 @@ static const WCHAR WC_TREEVIEWW[] = { 'S','y','s', #define TVS_SHAREDIMAGELISTS 0x0000 #define TVS_PRIVATEIMAGELISTS 0x0400 +#define TVS_EX_MULTISELECT 0x0002 +#define TVS_EX_DOUBLEBUFFER 0x0004 +#define TVS_EX_NOINDENTSTATE 0x0008 +#define TVS_EX_RICHTOOLTIP 0x0010 +#define TVS_EX_AUTOHSCROLL 0x0020 +#define TVS_EX_FADEINOUTEXPANDOS 0x0040 +#define TVS_EX_PARTIALCHECKBOXES 0x0080 +#define TVS_EX_EXCLUSIONCHECKBOXES 0x0100 +#define TVS_EX_DIMMEDCHECKBOXES 0x0200 +#define TVS_EX_DRAWIMAGEASYNC 0x0400 #define TVE_COLLAPSE 0x0001 #define TVE_EXPAND 0x0002

1 0

Hans Leidekker : msi: Compare file versions as numbers instead of strings.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 15f5b9dca3cbb1d97d65fa7ef02887846ca71915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f5b9dca3cbb1d97d65fa7ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 11 15:19:15 2010 +0200 msi: Compare file versions as numbers instead of strings. --- dlls/msi/action.c | 55 +++++++++++++++++++++++++++---------------------- dlls/msi/appsearch.c | 6 ++-- dlls/msi/files.c | 35 ++++++++++-------------------- dlls/msi/msipriv.h | 5 ++++ 4 files changed, 50 insertions(+), 51 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 48948fb..7ae8286 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1964,16 +1964,12 @@ static UINT ITERATE_CostFinalizeConditions(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } -static LPWSTR get_disk_file_version( LPCWSTR filename ) +VS_FIXEDFILEINFO *msi_get_disk_file_version( LPCWSTR filename ) { - static const WCHAR name_fmt[] = - {'%','u','.','%','u','.','%','u','.','%','u',0}; static const WCHAR name[] = {'\\',0}; - VS_FIXEDFILEINFO *lpVer; - WCHAR filever[0x100]; + VS_FIXEDFILEINFO *ret; LPVOID version; - DWORD versize; - DWORD handle; + DWORD versize, handle; UINT sz; TRACE("%s\n", debugstr_w(filename)); @@ -1983,23 +1979,32 @@ static LPWSTR get_disk_file_version( LPCWSTR filename ) return NULL; version = msi_alloc( versize ); + if (!version) + return NULL; + GetFileVersionInfoW( filename, 0, versize, version ); - if (!VerQueryValueW( version, name, (LPVOID*)&lpVer, &sz )) + if (!VerQueryValueW( version, name, (LPVOID *)&ret, &sz )) { msi_free( version ); return NULL; } - sprintfW( filever, name_fmt, - HIWORD(lpVer->dwFileVersionMS), - LOWORD(lpVer->dwFileVersionMS), - HIWORD(lpVer->dwFileVersionLS), - LOWORD(lpVer->dwFileVersionLS)); - msi_free( version ); + return ret; +} - return strdupW( filever ); +int msi_compare_file_versions( VS_FIXEDFILEINFO *fi, const WCHAR *version ) +{ + DWORD ms, ls; + + msi_parse_version_string( version, &ms, &ls ); + + if (fi->dwFileVersionMS > ms) return 1; + else if (fi->dwFileVersionMS < ms) return -1; + else if (fi->dwFileVersionLS > ls) return 1; + else if (fi->dwFileVersionLS < ls) return -1; + return 0; } static DWORD get_disk_file_size( LPCWSTR filename ) @@ -2033,7 +2038,7 @@ static BOOL hash_matches( MSIFILE *file ) static UINT set_file_install_states( MSIPACKAGE *package ) { - LPWSTR file_version; + VS_FIXEDFILEINFO *file_version; MSIFILE *file; LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) @@ -2050,18 +2055,14 @@ static UINT set_file_install_states( MSIPACKAGE *package ) /* calculate target */ p = resolve_folder(package, comp->Directory, FALSE, FALSE, TRUE, NULL); - msi_free(file->TargetPath); - TRACE("file %s is named %s\n", - debugstr_w(file->File), debugstr_w(file->FileName)); + TRACE("file %s is named %s\n", debugstr_w(file->File), debugstr_w(file->FileName)); file->TargetPath = build_directory_name(2, p, file->FileName); - msi_free(p); - TRACE("file %s resolves to %s\n", - debugstr_w(file->File), debugstr_w(file->TargetPath)); + TRACE("file %s resolves to %s\n", debugstr_w(file->File), debugstr_w(file->TargetPath)); if (GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) { @@ -2069,11 +2070,15 @@ static UINT set_file_install_states( MSIPACKAGE *package ) comp->Cost += file->FileSize; continue; } - if (file->Version && (file_version = get_disk_file_version( file->TargetPath ))) + if (file->Version && (file_version = msi_get_disk_file_version( file->TargetPath ))) { - TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(file_version)); + TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), + HIWORD(file_version->dwFileVersionMS), + LOWORD(file_version->dwFileVersionMS), + HIWORD(file_version->dwFileVersionLS), + LOWORD(file_version->dwFileVersionLS)); - if (strcmpiW(file_version, file->Version) < 0) + if (msi_compare_file_versions( file_version, file->Version ) < 0) { file->state = msifs_overwrite; comp->Cost += file->FileSize; diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 336bfca..34130b6 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -50,7 +50,7 @@ typedef struct tagMSISIGNATURE LPWSTR Languages; }MSISIGNATURE; -static void ACTION_VerStrToInteger(LPCWSTR verStr, PDWORD ms, PDWORD ls) +void msi_parse_version_string(LPCWSTR verStr, PDWORD ms, PDWORD ls) { const WCHAR *ptr; int x1 = 0, x2 = 0, x3 = 0, x4 = 0; @@ -109,13 +109,13 @@ static UINT ACTION_AppSearchGetSignature(MSIPACKAGE *package, MSISIGNATURE *sig, minVersion = msi_dup_record_field(row,3); if (minVersion) { - ACTION_VerStrToInteger(minVersion, &sig->MinVersionMS, &sig->MinVersionLS); + msi_parse_version_string( minVersion, &sig->MinVersionMS, &sig->MinVersionLS ); msi_free( minVersion ); } maxVersion = msi_dup_record_field(row,4); if (maxVersion) { - ACTION_VerStrToInteger(maxVersion, &sig->MaxVersionMS, &sig->MaxVersionLS); + msi_parse_version_string( maxVersion, &sig->MaxVersionMS, &sig->MaxVersionLS ); msi_free( maxVersion ); } sig->MinSize = MSI_RecordGetInteger(row,5); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index f21cd28..79d7814 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -60,24 +60,6 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac ui_progress( package, 2, f->FileSize, 0, 0 ); } -/* compares the version of a file read from the filesystem and - * the version specified in the File table - */ -static int msi_compare_file_version(MSIFILE *file) -{ - WCHAR version[MAX_PATH]; - DWORD size; - UINT r; - - size = MAX_PATH; - version[0] = '\0'; - r = MsiGetFileVersionW(file->TargetPath, version, &size, NULL, NULL); - if (r != ERROR_SUCCESS) - return 0; - - return lstrcmpW(version, file->Version); -} - static void schedule_install_files(MSIPACKAGE *package) { MSIFILE *file; @@ -981,6 +963,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) { MSIRECORD *uirow; LPWSTR dir, p; + VS_FIXEDFILEINFO *ver; if ( file->state == msifs_installed ) ERR("removing installed file %s\n", debugstr_w(file->TargetPath)); @@ -989,11 +972,17 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) file->Component->Installed == INSTALLSTATE_SOURCE ) continue; - /* don't remove a file if the old file - * is strictly newer than the version to be installed - */ - if ( msi_compare_file_version( file ) < 0 ) - continue; + if (file->Version) + { + ver = msi_get_disk_file_version( file->TargetPath ); + if (ver && msi_compare_file_versions( ver, file->Version ) > 0) + { + TRACE("newer version detected, not removing file\n"); + msi_free( ver ); + continue; + } + msi_free( ver ); + } TRACE("removing %s\n", debugstr_w(file->File) ); if (!DeleteFileW( file->TargetPath )) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 819d8bc..9f029f3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -32,6 +32,7 @@ #include "objbase.h" #include "objidl.h" #include "winnls.h" +#include "winver.h" #include "wine/list.h" #include "wine/debug.h" @@ -811,6 +812,10 @@ extern LPWSTR msi_reg_get_val_str( HKEY hkey, LPCWSTR name ); extern BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val); extern DWORD msi_version_str_to_dword(LPCWSTR p); +extern void msi_parse_version_string(LPCWSTR, PDWORD, PDWORD); +extern VS_FIXEDFILEINFO *msi_get_disk_file_version(LPCWSTR); +extern int msi_compare_file_versions(VS_FIXEDFILEINFO *, const WCHAR *); + extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value );

1 0

Hans Leidekker : msi: Disable an optimization in the execution of WHERE clauses.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 73774b3ef8b4f5af226b1c7dd929aeec85688894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73774b3ef8b4f5af226b1c7dd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 11 15:19:46 2010 +0200 msi: Disable an optimization in the execution of WHERE clauses. There's no guarantee that the condition strings are in the string table. --- dlls/msi/tests/db.c | 2 +- dlls/msi/where.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 56fa0f0..5e8505a 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1933,7 +1933,7 @@ static void test_where(void) rec = 0; query = "SELECT * FROM `Media` WHERE `DiskPrompt` <> 'Cabinet'"; r = do_query(hdb, query, &rec); - todo_wine ok( r == ERROR_SUCCESS, "query failed: %d\n", r ); + ok( r == ERROR_SUCCESS, "query failed: %d\n", r ); MsiCloseHandle( rec ); rec = 0; diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 545d6a8..4c4db49 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -397,6 +397,9 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) return ERROR_OUTOFMEMORY; wv->row_count = 0; + +if (0) /* disable optimization, there's no guarantee that strings are in the string table */ +{ if (wv->cond->type == EXPR_STRCMP) { MSIITERHANDLE handle = NULL; @@ -441,6 +444,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) } /* else fallback to slow case */ } +} for( i=0; i<count; i++ ) {

1 0

Nikolay Sivov : msvcrt: Add _snprintf_s implementation.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 59bddde594a9bca91de4f09914c092c37efe6200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59bddde594a9bca91de4f0991… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 23:12:20 2010 +0400 msvcrt: Add _snprintf_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2117c05..e6524d6 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1044,7 +1044,7 @@ @ stub _snprintf_c @ stub _snprintf_c_l @ stub _snprintf_l -@ stub _snprintf_s +@ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s @ stub _snprintf_s_l @ stub _snscanf @ stub _snscanf_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0249277..db65318 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -891,7 +891,7 @@ @ stub _snprintf_c @ stub _snprintf_c_l @ stub _snprintf_l -@ stub _snprintf_s +@ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s @ stub _snprintf_s_l @ stub _snscanf @ stub _snscanf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6592e7c..1da6e82 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -877,7 +877,7 @@ @ stub _snprintf_c @ stub _snprintf_c_l @ stub _snprintf_l -@ stub _snprintf_s +@ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s @ stub _snprintf_s_l @ stub _snscanf @ stub _snscanf_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 604a5ce..ff19519 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -830,7 +830,7 @@ # stub _snprintf_c # stub _snprintf_c_l # stub _snprintf_l -# stub _snprintf_s +@ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s # stub _snprintf_s_l # stub _snscanf # stub _snscanf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 78e42b2..9571928 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1103,6 +1103,20 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) } /********************************************************************* + * _snprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count, + const char *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = MSVCRT_vsnprintf_s_l(str, len, count, format, NULL, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * vsnwprintf_internal (INTERNAL) */ static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len,

1 0

Nikolay Sivov : msvcrt: Add _snwprintf_s implementation.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 1a234159fe1e5fc24a0035f43265f70672abd41f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a234159fe1e5fc24a0035f43… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 23:28:01 2010 +0400 msvcrt: Add _snwprintf_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e6524d6..b0b8172 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1052,7 +1052,7 @@ @ stub _snscanf_s_l @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ stub _snwprintf_l -@ stub _snwprintf_s +@ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s @ stub _snwprintf_s_l @ stub _snwscanf @ stub _snwscanf_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index db65318..a8ba61e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -899,7 +899,7 @@ @ stub _snscanf_s_l @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ stub _snwprintf_l -@ stub _snwprintf_s +@ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s @ stub _snwprintf_s_l @ stub _snwscanf @ stub _snwscanf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1da6e82..df65a5c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -885,7 +885,7 @@ @ stub _snscanf_s_l @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ stub _snwprintf_l -@ stub _snwprintf_s +@ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s @ stub _snwprintf_s_l @ stub _snwscanf @ stub _snwscanf_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ff19519..88a2ab9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -838,7 +838,7 @@ # stub _snscanf_s_l @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf # stub _snwprintf_l -# stub _snwprintf_s +@ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s # stub _snwprintf_s_l # stub _snwscanf # stub _snwscanf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9571928..4485db3 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1205,6 +1205,20 @@ int CDECL MSVCRT__snwprintf( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT } /********************************************************************* + * _snwprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT__snwprintf_s( MSVCRT_wchar_t *str, unsigned int len, unsigned int count, + const MSVCRT_wchar_t *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = MSVCRT_vsnwprintf_s_l(str, len, count, format, NULL, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * sprintf (MSVCRT.@) */ int CDECL MSVCRT_sprintf( char *str, const char *format, ... )

1 0

Nikolay Sivov : msvcrt: Add _scwprintf implementation.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 97807760cad4bbbb06a072faa0c34b66ba952d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97807760cad4bbbb06a072faa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 23:54:30 2010 +0400 msvcrt: Add _scwprintf implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b0b8172..44c5b31 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1012,7 +1012,7 @@ @ stub _scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ stub _scwprintf_l @ stub _scwprintf_p @ stub _scwprintf_p_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a8ba61e..256031c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -857,7 +857,7 @@ @ stub _scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ stub _scwprintf_l @ stub _scwprintf_p @ stub _scwprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index df65a5c..a2bed36 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -843,7 +843,7 @@ @ stub _scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ stub _scwprintf_l @ stub _scwprintf_p @ stub _scwprintf_p_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 88a2ab9..bba06d6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -801,7 +801,7 @@ # stub _scprintf # stub _scprintf_l # stub _scprintf_p_l -# stub _scwprintf +@ varargs _scwprintf(wstr) MSVCRT__scwprintf # stub _scwprintf_l # stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4485db3..03ecc7f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1247,6 +1247,20 @@ int CDECL MSVCRT_sprintf_s( char *str, MSVCRT_size_t num, const char *format, .. } /********************************************************************* + * _scwprintf (MSVCRT.@) + */ +int CDECL MSVCRT__scwprintf( const MSVCRT_wchar_t *format, ... ) +{ + __ms_va_list ap; + int r; + + __ms_va_start( ap, format ); + r = MSVCRT_vsnwprintf( NULL, INT_MAX, format, ap ); + __ms_va_end( ap ); + return r; +} + +/********************************************************************* * swprintf (MSVCRT.@) */ int CDECL MSVCRT_swprintf( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, ... )

1 0

Damjan Jovanovic : kernel32: CopyFile cannot overwrite a file with itself.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 3f1404bf29676d79dd76ffd31e2630bb9f2b0b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1404bf29676d79dd76ffd31… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 10 22:14:13 2010 +0200 kernel32: CopyFile cannot overwrite a file with itself. --- dlls/kernel32/path.c | 2 +- dlls/kernel32/tests/file.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c319cb5..2bfd062 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -911,7 +911,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) return FALSE; } - if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ, NULL, fail_if_exists ? CREATE_NEW : CREATE_ALWAYS, info.dwFileAttributes, h1 )) == INVALID_HANDLE_VALUE) { diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b6f066e..fcc7fc0 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -598,6 +598,10 @@ static void test_CopyFileA(void) ok( retok && ret == sizeof(prefix), "WriteFile error %d\n", GetLastError()); ok(GetFileSize(hfile, NULL) == sizeof(prefix), "source file has wrong size\n"); + /* copying a file to itself must fail */ + retok = CopyFileA(source, source, FALSE); + ok( !retok && (GetLastError() == ERROR_SHARING_VIOLATION || broken(GetLastError() == ERROR_FILE_EXISTS) /* Win 9x */), + "copying a file to itself didn't fail (ret=%d, err=%d)\n", retok, GetLastError()); /* get the file time and change it to prove the difference */ ret = GetFileTime(hfile, NULL, NULL, &ft1); ok( ret, "GetFileTime error %d\n", GetLastError()); @@ -618,6 +622,14 @@ static void test_CopyFileA(void) ret = CopyFileA(source, dest, FALSE); ok(ret, "CopyFileA: error %d\n", GetLastError()); + /* destination file is write-locked during copy */ + hfile = CreateFileA(dest, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); + retok = CopyFileA(source, dest, FALSE); + ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION, + "copying to a write-locked file didn't fail (ret=%d, err=%d)\n", ret, GetLastError()); + CloseHandle(hfile); + /* make sure that destination has correct size */ hfile = CreateFileA(dest, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file\n");

1 0

Igor Paliychuk : kernel32: Update Ukrainian translations.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 4801209c5c1a2eda950d1c89e53d9e907be79c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4801209c5c1a2eda950d1c89e… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Thu Jun 10 19:05:34 2010 +0300 kernel32: Update Ukrainian translations. --- dlls/kernel32/nls/ukr.nls | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/nls/ukr.nls b/dlls/kernel32/nls/ukr.nls index 865fd2d..a32aac5 100644 --- a/dlls/kernel32/nls/ukr.nls +++ b/dlls/kernel32/nls/ukr.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_S2359 "" LOCALE_SABBREVCTRYNAME "UKR" LOCALE_SABBREVDAYNAME1 "��" - LOCALE_SABBREVDAYNAME2 "��" + LOCALE_SABBREVDAYNAME2 "��" LOCALE_SABBREVDAYNAME3 "��" LOCALE_SABBREVDAYNAME4 "��" LOCALE_SABBREVDAYNAME5 "��" @@ -82,7 +82,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME9 "��" LOCALE_SABBREVMONTHNAME10 "��" LOCALE_SABBREVMONTHNAME11 "��" - LOCALE_SABBREVMONTHNAME12 "��" + LOCALE_SABBREVMONTHNAME12 "��" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Ukraine" LOCALE_SCURRENCY "��." @@ -107,18 +107,18 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy' �.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "ѳ��" - LOCALE_SMONTHNAME2 "��" - LOCALE_SMONTHNAME3 "��" - LOCALE_SMONTHNAME4 "��" - LOCALE_SMONTHNAME5 "��" - LOCALE_SMONTHNAME6 "��" - LOCALE_SMONTHNAME7 "��" - LOCALE_SMONTHNAME8 "��" - LOCALE_SMONTHNAME9 "��" - LOCALE_SMONTHNAME10 "��" - LOCALE_SMONTHNAME11 "��" - LOCALE_SMONTHNAME12 "��" + LOCALE_SMONTHNAME1 "ѳ��\0��" + LOCALE_SMONTHNAME2 "��\0��" + LOCALE_SMONTHNAME3 "��\0��" + LOCALE_SMONTHNAME4 "��\0��" + LOCALE_SMONTHNAME5 "��\0��" + LOCALE_SMONTHNAME6 "��\0��" + LOCALE_SMONTHNAME7 "��\0��" + LOCALE_SMONTHNAME8 "��\0��" + LOCALE_SMONTHNAME9 "��\0��" + LOCALE_SMONTHNAME10 "��\0��" + LOCALE_SMONTHNAME11 "��\0��" + LOCALE_SMONTHNAME12 "��\0��" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "�" LOCALE_SNAME "uk-UA"

1 0

Nikolay Sivov : msvcrt: Fix __lconv_init() prototype.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 90013af6f932d7553290f1eb42490ec7f4d94f46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90013af6f932d7553290f1eb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 11 03:57:53 2010 +0400 msvcrt: Fix __lconv_init() prototype. --- dlls/msvcr90/msvcr90.c | 1 + dlls/msvcrt/locale.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 43a1834..0d7d101 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -93,6 +93,7 @@ int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) while (!res && table < end) { if (*table) { + TRACE("calling %p\n", **table); res = (**table)(); if (res) TRACE("function %p failed: 0x%x\n", *table, res); diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index a347962..5a27de0 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -541,10 +541,11 @@ struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) /********************************************************************* * __lconv_init (MSVCRT.@) */ -void CDECL __lconv_init(void) +int CDECL __lconv_init(void) { /* this is used to make chars unsigned */ charmax = 255; + return 0; } /*********************************************************************

1 0