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

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

19 Apr '10

Module: wine Branch: master Commit: 1b4bacea8c9b8bb4208cc5e91c473d595f7fbca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4bacea8c9b8bb4208cc5e91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:59:02 2010 +0200 msvcrt: Added fopen_s implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 30 +++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 04535b3..44507ec 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1259,7 +1259,7 @@ @ cdecl floor(double) msvcrt.floor @ cdecl fmod(double double) msvcrt.fmod @ cdecl fopen(str str) msvcrt.fopen -@ stub fopen_s +@ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf @ stub fprintf_s @ cdecl fputc(long ptr) msvcrt.fputc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ae13be4..1e6731f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1243,7 +1243,7 @@ @ cdecl floor(double) msvcrt.floor @ cdecl fmod(double double) msvcrt.fmod @ cdecl fopen(str str) msvcrt.fopen -@ stub fopen_s +@ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf @ stub fprintf_s @ cdecl fputc(long ptr) msvcrt.fputc diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c5b2798..6641999 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -218,6 +218,7 @@ static int msvcrt_alloc_fd_from(HANDLE hand, int flag, int fd) if (fd >= MSVCRT_MAX_FILES) { WARN(":files exhausted!\n"); + *MSVCRT__errno() = MSVCRT_ENFILE; return -1; } MSVCRT_fdesc[fd].handle = hand; @@ -1033,6 +1034,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st *stream_flags = plus ? MSVCRT__IORW : MSVCRT__IOWRT; break; default: + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; return -1; } @@ -2649,10 +2652,16 @@ MSVCRT_FILE * CDECL MSVCRT__fsopen(const char *path, const char *mode, int share MSVCRT_FILE *ret; MSVCRT_wchar_t *pathW = NULL, *modeW = NULL; - if (path && !(pathW = msvcrt_wstrdupa(path))) return NULL; + if (path && !(pathW = msvcrt_wstrdupa(path))) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return NULL; + } if (mode && !(modeW = msvcrt_wstrdupa(mode))) { MSVCRT_free(pathW); + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; } @@ -2672,6 +2681,25 @@ MSVCRT_FILE * CDECL MSVCRT_fopen(const char *path, const char *mode) } /********************************************************************* + * fopen_s (MSVCRT.@) + */ +int CDECL MSVCRT_fopen_s(MSVCRT_FILE** pFile, + const char *filename, const char *mode) +{ + if(!pFile) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + *pFile = MSVCRT_fopen(filename, mode); + + if(!*pFile) + return *MSVCRT__errno(); + return 0; +} + +/********************************************************************* * _wfopen (MSVCRT.@) */ MSVCRT_FILE * CDECL MSVCRT__wfopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f4f9ee8..fdd58c2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1190,7 +1190,7 @@ @ cdecl floor(double) MSVCRT_floor @ cdecl fmod(double double) MSVCRT_fmod @ cdecl fopen(str str) MSVCRT_fopen -# stub fopen_s +@ cdecl fopen_s(ptr str str) MSVCRT_fopen_s @ varargs fprintf(ptr str) MSVCRT_fprintf # stub fprintf_s @ cdecl fputc(long ptr) MSVCRT_fputc

1 0

Octavian Voicu : msi: Fix crash when calling MsiGetActiveDatabase with invalid remote handle.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 9c892430ba3d9cf5c6c507ca258f0cb08400e2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c892430ba3d9cf5c6c507ca2… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Mon Apr 19 12:49:40 2010 +0300 msi: Fix crash when calling MsiGetActiveDatabase with invalid remote handle. --- dlls/msi/package.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b1741ae..71346f4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1357,6 +1357,7 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) { MSIPACKAGE *package; MSIHANDLE handle = 0; + IUnknown *remote_unk; IWineMsiRemotePackage *remote_package; TRACE("(%d)\n",hInstall); @@ -1367,10 +1368,19 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) handle = alloc_msihandle( &package->db->hdr ); msiobj_release( &package->hdr ); } - else if ((remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ))) + else if ((remote_unk = msi_get_remote(hInstall))) { - IWineMsiRemotePackage_GetActiveDatabase(remote_package, &handle); - IWineMsiRemotePackage_Release(remote_package); + if (IUnknown_QueryInterface(remote_unk, &IID_IWineMsiRemotePackage, + (LPVOID *)&remote_package) == S_OK) + { + IWineMsiRemotePackage_GetActiveDatabase(remote_package, &handle); + IWineMsiRemotePackage_Release(remote_package); + } + else + { + WARN("remote handle %d is not a package\n", hInstall); + } + IUnknown_Release(remote_unk); } return handle;

1 0

Octavian Voicu : msi: Use standard window class for combo control and add error checking.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 2793a4fd52112f25de3e32620a0b141f5b852211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2793a4fd52112f25de3e32620… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Mon Apr 19 12:59:01 2010 +0300 msi: Use standard window class for combo control and add error checking. --- dlls/msi/dialog.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ac2e95a..5afced2 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1224,7 +1224,7 @@ static UINT msi_dialog_icon_control( msi_dialog *dialog, MSIRECORD *rec ) static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) { - static const WCHAR szCombo[] = { 'C','O','M','B','O','B','O','X',0 }; + msi_control *control; DWORD attributes, style; style = CBS_AUTOHSCROLL | WS_TABSTOP | WS_GROUP | WS_CHILD; @@ -1236,7 +1236,10 @@ static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) else style |= CBS_DROPDOWN; - msi_dialog_add_control( dialog, rec, szCombo, style ); + control = msi_dialog_add_control( dialog, rec, WC_COMBOBOXW, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + return ERROR_SUCCESS; }

1 0

Octavian Voicu : msi: Fill combo control with items from database.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 857f979468a5a9f542f4502e719f035847cbb92b URL: http://source.winehq.org/git/wine.git/?a=commit;h=857f979468a5a9f542f4502e7… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Mon Apr 19 12:59:02 2010 +0300 msi: Fill combo control with items from database. --- dlls/msi/dialog.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5afced2..f53e122 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1222,10 +1222,105 @@ static UINT msi_dialog_icon_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } +/******************** Combo Box ***************************************/ + +struct msi_combobox_info +{ + msi_dialog *dialog; + HWND hwnd; + WNDPROC oldproc; + DWORD num_items; + DWORD addpos_items; + LPWSTR *items; +}; + +static LRESULT WINAPI MSIComboBox_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + struct msi_combobox_info *info; + LRESULT r; + DWORD j; + + TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam); + + info = GetPropW( hWnd, szButtonData ); + if (!info) + return 0; + + r = CallWindowProcW( info->oldproc, hWnd, msg, wParam, lParam ); + + switch (msg) + { + case WM_NCDESTROY: + for (j = 0; j < info->num_items; j++) + msi_free( info->items[j] ); + msi_free( info->items ); + msi_free( info ); + RemovePropW( hWnd, szButtonData ); + break; + } + + return r; +} + +static UINT msi_combobox_add_item( MSIRECORD *rec, LPVOID param ) +{ + struct msi_combobox_info *info = param; + LPCWSTR value, text; + int pos; + + value = MSI_RecordGetString( rec, 3 ); + text = MSI_RecordGetString( rec, 4 ); + + info->items[info->addpos_items] = strdupW( value ); + + pos = SendMessageW( info->hwnd, CB_ADDSTRING, 0, (LPARAM)text ); + SendMessageW( info->hwnd, CB_SETITEMDATA, pos, (LPARAM)info->items[info->addpos_items] ); + info->addpos_items++; + + return ERROR_SUCCESS; +} + +static UINT msi_combobox_add_items( struct msi_combobox_info *info, LPCWSTR property ) +{ + UINT r; + MSIQUERY *view = NULL; + DWORD count; + + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ', + 'F','R','O','M',' ','`','C','o','m','b','o','B','o','x','`',' ', + 'W','H','E','R','E',' ', + '`','P','r','o','p','e','r','t','y','`',' ','=',' ','\'','%','s','\'',' ', + 'O','R','D','E','R',' ','B','Y',' ','`','O','r','d','e','r','`',0 + }; + + r = MSI_OpenQuery( info->dialog->package->db, &view, query, property ); + if (r != ERROR_SUCCESS) + return r; + + /* just get the number of records */ + count = 0; + r = MSI_IterateRecords( view, &count, NULL, NULL ); + + info->num_items = count; + info->items = msi_alloc( sizeof(*info->items) * count ); + + r = MSI_IterateRecords( view, NULL, msi_combobox_add_item, info ); + msiobj_release( &view->hdr ); + + return r; +} + static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) { + struct msi_combobox_info *info; msi_control *control; DWORD attributes, style; + LPCWSTR prop; + + info = msi_alloc( sizeof *info ); + if (!info) + return ERROR_FUNCTION_FAILED; style = CBS_AUTOHSCROLL | WS_TABSTOP | WS_GROUP | WS_CHILD; attributes = MSI_RecordGetInteger( rec, 8 ); @@ -1238,7 +1333,25 @@ static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) control = msi_dialog_add_control( dialog, rec, WC_COMBOBOXW, style ); if (!control) + { + msi_free( info ); return ERROR_FUNCTION_FAILED; + } + + prop = MSI_RecordGetString( rec, 9 ); + control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + + /* subclass */ + info->dialog = dialog; + info->hwnd = control->hwnd; + info->items = NULL; + info->addpos_items = 0; + info->oldproc = (WNDPROC)SetWindowLongPtrW( control->hwnd, GWLP_WNDPROC, + (LONG_PTR)MSIComboBox_WndProc ); + SetPropW( control->hwnd, szButtonData, info ); + + if (control->property) + msi_combobox_add_items( info, control->property ); return ERROR_SUCCESS; }

1 0

Octavian Voicu : msi: Sync combo control value with associated property.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 80878d00da9b83fe456500efd73b8312e8383836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80878d00da9b83fe456500efd… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Mon Apr 19 12:59:03 2010 +0300 msi: Sync combo control value with associated property. --- dlls/msi/dialog.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index f53e122..002ea83 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -171,6 +171,8 @@ static MSIFEATURE *msi_seltree_get_selected_feature( msi_control *control ); static DWORD uiThreadId; static HWND hMsiHiddenWindow; +static LPWSTR msi_get_window_text( HWND hwnd ); + static INT msi_dialog_scale_unit( msi_dialog *dialog, INT val ) { return MulDiv( val, dialog->scale, 12 ); @@ -1311,6 +1313,69 @@ static UINT msi_combobox_add_items( struct msi_combobox_info *info, LPCWSTR prop return r; } +static UINT msi_dialog_combobox_handler( msi_dialog *dialog, + msi_control *control, WPARAM param ) +{ + struct msi_combobox_info *info; + int index; + LPWSTR value; + + if (HIWORD(param) != CBN_SELCHANGE && HIWORD(param) != CBN_EDITCHANGE) + return ERROR_SUCCESS; + + info = GetPropW( control->hwnd, szButtonData ); + index = SendMessageW( control->hwnd, CB_GETCURSEL, 0, 0 ); + if (index == CB_ERR) + value = msi_get_window_text( control->hwnd ); + else + value = (LPWSTR) SendMessageW( control->hwnd, CB_GETITEMDATA, index, 0 ); + + MSI_SetPropertyW( info->dialog->package, + control->property, value ); + msi_dialog_evaluate_control_conditions( info->dialog ); + + if (index == CB_ERR) + msi_free( value ); + + return ERROR_SUCCESS; +} + +static void msi_dialog_combobox_update( msi_dialog *dialog, + msi_control *control ) +{ + struct msi_combobox_info *info; + LPWSTR value, tmp; + DWORD j; + + info = GetPropW( control->hwnd, szButtonData ); + + value = msi_dup_property( dialog->package, control->property ); + if (!value) + { + SendMessageW( control->hwnd, CB_SETCURSEL, -1, 0 ); + return; + } + + for (j = 0; j < info->num_items; j++) + { + tmp = (LPWSTR) SendMessageW( control->hwnd, CB_GETITEMDATA, j, 0 ); + if (!lstrcmpW( value, tmp )) + break; + } + + if (j < info->num_items) + { + SendMessageW( control->hwnd, CB_SETCURSEL, j, 0 ); + } + else + { + SendMessageW( control->hwnd, CB_SETCURSEL, -1, 0 ); + SetWindowTextW( control->hwnd, value ); + } + + msi_free(value); +} + static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) { struct msi_combobox_info *info; @@ -1338,6 +1403,9 @@ static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_FUNCTION_FAILED; } + control->handler = msi_dialog_combobox_handler; + control->update = msi_dialog_combobox_update; + prop = MSI_RecordGetString( rec, 9 ); control->property = msi_dialog_dup_property( dialog, prop, FALSE ); @@ -1353,6 +1421,8 @@ static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) if (control->property) msi_combobox_add_items( info, control->property ); + msi_dialog_combobox_update( dialog, control ); + return ERROR_SUCCESS; }

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: 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

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

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: 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