wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Alexandre Julliard : Release 1.1.38.
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: 16bcc06bb29036cb3c0a08f934091342ea49f97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16bcc06bb29036cb3c0a08f93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 18:31:34 2010 +0100 Release 1.1.38. --- ANNOUNCE | 1023 +++++++++++++++++++++++++++++++++++++++---------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 674 insertions(+), 369 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16bcc06bb29036cb3c0a0…

1 0

Alexandre Julliard : configure: Avoid incorrectly cleaning up symlink targets when running in the source dir .
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: 9acf1d18ce8904830f19c5987e4324b8dc81f6db URL: http://source.winehq.org/git/wine.git/?a=commit;h=9acf1d18ce8904830f19c5987… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 17:24:12 2010 +0100 configure: Avoid incorrectly cleaning up symlink targets when running in the source dir. --- aclocal.m4 | 2 +- configure | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 3240435..357edf8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -147,7 +147,7 @@ dnl dnl Usage: WINE_CONFIG_SYMLINK(name,target) dnl AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl -ALL_SYMLINKS="$ALL_SYMLINKS \\ +m4_if([$2],,[test "$srcdir" = "." || ])ALL_SYMLINKS="$ALL_SYMLINKS \\ $1"]) dnl **** Create a make rules file from config.status **** diff --git a/configure b/configure index f60272d..ab9c17b 100755 --- a/configure +++ b/configure @@ -13686,19 +13686,19 @@ ac_config_commands="$ac_config_commands include/stamp-h" ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" -ALL_SYMLINKS="$ALL_SYMLINKS \\ +test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\ dlls/wineps.drv/generic.ppd" ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" -ALL_SYMLINKS="$ALL_SYMLINKS \\ +test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\ fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" -ALL_SYMLINKS="$ALL_SYMLINKS \\ +test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\ fonts/symbol.ttf" ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" -ALL_SYMLINKS="$ALL_SYMLINKS \\ +test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\ fonts/tahoma.ttf" ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" -ALL_SYMLINKS="$ALL_SYMLINKS \\ +test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\ fonts/tahomabd.ttf" ac_config_links="$ac_config_links wine:tools/winewrapper" ALL_SYMLINKS="$ALL_SYMLINKS \\

1 0

Hans Leidekker : msi: Implement the SelfUnregModules standard action.
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: f5af1ca39957353b191c9f86ead1994c2789d4fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5af1ca39957353b191c9f86e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 5 14:48:20 2010 +0100 msi: Implement the SelfUnregModules standard action. --- dlls/msi/action.c | 89 ++++++++++++++++++++++++++++++++++++++++++--- dlls/msi/tests/install.c | 66 ++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 39db2ca..d94d842 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3705,6 +3705,89 @@ static UINT ACTION_SelfRegModules(MSIPACKAGE *package) return ERROR_SUCCESS; } +static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param ) +{ + static const WCHAR regsvr32[] = + {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','u',' ','\"',0}; + static const WCHAR close[] = {'\"',0}; + MSIPACKAGE *package = param; + LPCWSTR filename; + LPWSTR cmdline; + MSIFILE *file; + DWORD len; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + BOOL ret; + MSIRECORD *uirow; + LPWSTR uipath, p; + + memset( &si, 0, sizeof(STARTUPINFOW) ); + + filename = MSI_RecordGetString( row, 1 ); + file = get_loaded_file( package, filename ); + + if (!file) + { + ERR("Unable to find file id %s\n", debugstr_w(filename)); + return ERROR_SUCCESS; + } + + len = strlenW( regsvr32 ) + strlenW( file->TargetPath ) + 2; + + cmdline = msi_alloc( len * sizeof(WCHAR) ); + strcpyW( cmdline, regsvr32 ); + strcatW( cmdline, file->TargetPath ); + strcatW( cmdline, close ); + + TRACE("Unregistering %s\n", debugstr_w(cmdline)); + + ret = CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, c_colon, &si, &pi ); + if (ret) + { + CloseHandle( pi.hThread ); + msi_dialog_check_messages( pi.hProcess ); + CloseHandle( pi.hProcess ); + } + + msi_free( cmdline ); + + uirow = MSI_CreateRecord( 2 ); + uipath = strdupW( file->TargetPath ); + if ((p = strrchrW( uipath, '\\' ))) + { + *p = 0; + MSI_RecordSetStringW( uirow, 1, ++p ); + } + MSI_RecordSetStringW( uirow, 2, uipath ); + ui_actiondata( package, szSelfUnregModules, uirow ); + msiobj_release( &uirow->hdr ); + msi_free( uipath ); + /* FIXME call ui_progress? */ + + return ERROR_SUCCESS; +} + +static UINT ACTION_SelfUnregModules( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','S','e','l','f','R','e','g','`',0}; + + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (rc != ERROR_SUCCESS) + { + TRACE("no SelfReg table\n"); + return ERROR_SUCCESS; + } + + MSI_IterateRecords( view, NULL, ITERATE_SelfUnregModules, package ); + msiobj_release( &view->hdr ); + + return ERROR_SUCCESS; +} + static UINT ACTION_PublishFeatures(MSIPACKAGE *package) { MSIFEATURE *feature; @@ -6111,12 +6194,6 @@ static UINT ACTION_MigrateFeatureStates( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "MigrateFeatureStates", table ); } -static UINT ACTION_SelfUnregModules( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'S','e','l','f','R','e','g',0 }; - return msi_unimplemented_action_stub( package, "SelfUnregModules", table ); -} - static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) { static const WCHAR table[] = { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e3f61a0..a3f1897 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1145,6 +1145,30 @@ static const CHAR rf_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "InstallValidate\t\t1400\n" "LaunchConditions\t\t100\n"; + +static const CHAR sr_selfreg_dat[] = "File_\tCost\n" + "s72\tI2\n" + "SelfReg\tFile_\n" + "one.txt\t1\n"; + +static const CHAR sr_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostFinalize\t\t1000\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "ResolveSource\t\t950\n" + "MoveFiles\t\t1700\n" + "SelfUnregModules\t\t3900\n" + "InstallFiles\t\t4000\n" + "DuplicateFiles\t\t4500\n" + "WriteEnvironmentStrings\t\t4550\n" + "CreateShortcuts\t\t4600\n" + "InstallFinalize\t\t6600\n" + "InstallInitialize\t\t1500\n" + "InstallValidate\t\t1400\n" + "LaunchConditions\t\t100\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1902,6 +1926,19 @@ static const msi_table sds_tables[] = ADD_TABLE(property) }; +static const msi_table sr_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(sr_selfreg), + ADD_TABLE(sr_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -7635,6 +7672,34 @@ static void test_delete_services(void) delete_test_files(); } +static void test_self_registration(void) +{ + UINT r; + + create_test_files(); + create_database(msifile, sr_tables, sizeof(sr_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -7730,6 +7795,7 @@ START_TEST(install) test_remove_folder(); test_start_services(); test_delete_services(); + test_self_registration(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Implement the RemoveFolders standard action.
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: 3864ddf9f2e264be9edee5e40c530f4c67d0a97f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3864ddf9f2e264be9edee5e40… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 5 14:47:55 2010 +0100 msi: Implement the RemoveFolders standard action. --- dlls/msi/action.c | 61 +++++++++++++++++++++++++++++++++++++---- dlls/msi/tests/install.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 46d0f7e..39db2ca 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -980,6 +980,61 @@ static UINT ACTION_CreateFolders(MSIPACKAGE *package) return rc; } +static UINT ITERATE_RemoveFolders( MSIRECORD *row, LPVOID param ) +{ + MSIPACKAGE *package = param; + LPCWSTR dir; + LPWSTR full_path; + MSIRECORD *uirow; + MSIFOLDER *folder; + + dir = MSI_RecordGetString( row, 1 ); + if (!dir) + { + ERR("Unable to get folder id\n"); + return ERROR_SUCCESS; + } + + full_path = resolve_folder( package, dir, FALSE, FALSE, TRUE, &folder ); + if (!full_path) + { + ERR("Unable to resolve folder id %s\n", debugstr_w(dir)); + return ERROR_SUCCESS; + } + + TRACE("folder is %s\n", debugstr_w(full_path)); + + uirow = MSI_CreateRecord( 1 ); + MSI_RecordSetStringW( uirow, 1, full_path ); + ui_actiondata( package, szRemoveFolders, uirow ); + msiobj_release( &uirow->hdr ); + + RemoveDirectoryW( full_path ); + folder->State = 0; + + msi_free( full_path ); + return ERROR_SUCCESS; +} + +static UINT ACTION_RemoveFolders( MSIPACKAGE *package ) +{ + static const WCHAR query[] = + {'S','E','L','E','C','T',' ', '`','D','i','r','e','c','t','o','r','y','_','`', + ' ','F','R','O','M',' ', '`','C','r','e','a','t','e','F','o','l','d','e','r','`',0}; + + MSIQUERY *view; + UINT rc; + + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_RemoveFolders, package ); + msiobj_release( &view->hdr ); + + return rc; +} + static UINT load_component( MSIRECORD *row, LPVOID param ) { MSIPACKAGE *package = param; @@ -6125,12 +6180,6 @@ static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "RemoveExistingProducts", table ); } -static UINT ACTION_RemoveFolders( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'C','r','e','a','t','e','F','o','l','d','e','r',0 }; - return msi_unimplemented_action_stub( package, "RemoveFolders", table ); -} - static UINT ACTION_RemoveODBC( MSIPACKAGE *package ) { static const WCHAR table[] = { 'O','D','B','C','D','r','i','v','e','r',0 }; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 62d3a66..e3f61a0 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1120,6 +1120,31 @@ static const CHAR cf_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComm "s72\ti2\tS64\tS0\tS255\n" "CustomAction\tAction\n" "TestCreateFolders\t19\t\tHalts installation\t\n"; + +static const CHAR rf_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostFinalize\t\t1000\n" + "ValidateProductID\t\t700\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "RemoveFiles\t\t3500\n" + "CreateFolders\t\t3600\n" + "RemoveFolders\t\t3700\n" + "InstallExecute\t\t3800\n" + "TestCreateFolders\t\t3900\n" + "InstallFiles\t\t4000\n" + "RegisterUser\t\t6000\n" + "RegisterProduct\t\t6100\n" + "PublishFeatures\t\t6300\n" + "PublishProduct\t\t6400\n" + "InstallFinalize\t\t6600\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "UnpublishFeatures\t\t1800\n" + "InstallValidate\t\t1400\n" + "LaunchConditions\t\t100\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1837,6 +1862,20 @@ static const msi_table cf_tables[] = ADD_TABLE(property) }; +static const msi_table rf_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(cf_create_folders), + ADD_TABLE(rf_install_exec_seq), + ADD_TABLE(cf_custom_action), + ADD_TABLE(media), + ADD_TABLE(property) +}; + static const msi_table sss_tables[] = { ADD_TABLE(component), @@ -7461,6 +7500,34 @@ static void test_create_folder(void) delete_test_files(); } +static void test_remove_folder(void) +{ + UINT r; + + create_test_files(); + create_database(msifile, rf_tables, sizeof(rf_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + ok(!delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout\\new", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\cabout\\four.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\changed\\three.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\changed", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\first\\two.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\first", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\filename", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\one.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\service.exe", TRUE), "File installed\n"); + ok(!delete_pf("msitest", FALSE), "Directory created\n"); + + delete_test_files(); +} + static void test_start_services(void) { UINT r; @@ -7660,6 +7727,7 @@ START_TEST(install) test_allusers_prop(); test_feature_override(); test_create_folder(); + test_remove_folder(); test_start_services(); test_delete_services();

1 0

Huw Davies : msdaps: Add support for remoting IRow_Open.
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: d3f81a95df3a7f0528a1c45b39a4c289f015d158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f81a95df3a7f0528a1c45b3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 19:54:59 2010 +0000 msdaps: Add support for remoting IRow_Open. --- dlls/msdaps/row_server.c | 54 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 26d0e13..a9f7a45 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -219,10 +219,51 @@ static HRESULT WINAPI server_Open(IWineRowServer* iface, IUnknown *pUnkOuter, DB IUnknown **ppUnk) { server *This = impl_from_IWineRowServer(iface); + IRow *row; + HRESULT hr; + IWineRowServer *new_server; + IMarshal *marshal; + IUnknown *obj; - FIXME("(%p)->(%p, %p, %s, %08x, %s, %p): stub\n", This, pUnkOuter, pColumnID, debugstr_guid(rguidColumnType), + TRACE("(%p)->(%p, %p, %s, %08x, %s, %p)\n", This, pUnkOuter, pColumnID, debugstr_guid(rguidColumnType), dwBindFlags, debugstr_guid(riid), ppUnk); - return E_NOTIMPL; + + *ppUnk = NULL; + + hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRow, (void**)&row); + if(FAILED(hr)) return hr; + + if(IsEqualGUID(rguidColumnType, &DBGUID_ROWSET)) + hr = CoCreateInstance(&CLSID_wine_rowset_server, NULL, CLSCTX_INPROC_SERVER, &IID_IWineRowServer, (void**)&new_server); + else + { + FIXME("Unhandled object %s\n", debugstr_guid(rguidColumnType)); + hr = E_NOTIMPL; + } + + if(FAILED(hr)) + { + IRow_Release(row); + return hr; + } + + IWineRowServer_GetMarshal(new_server, &marshal); + hr = IRow_Open(row, (IUnknown*)marshal, pColumnID, rguidColumnType, dwBindFlags, &IID_IUnknown, &obj); + IMarshal_Release(marshal); + IRow_Release(row); + + if(FAILED(hr)) + { + IWineRowServer_Release(new_server); + return hr; + } + + IWineRowServer_SetInnerUnk(new_server, obj); + hr = IUnknown_QueryInterface(obj, riid, (void**)ppUnk); + IUnknown_Release(obj); + + TRACE("returning %08x\n", hr); + return hr; } static HRESULT WINAPI server_SetColumns(IWineRowServer* iface, DBORDINAL num_cols, @@ -659,10 +700,15 @@ static HRESULT WINAPI row_Open(IRow* iface, IUnknown *pUnkOuter, { row_proxy *This = impl_from_IRow(iface); - FIXME("(%p)->(%p, %p, %s, %08x, %s, %p): stub\n", This, pUnkOuter, pColumnID, debugstr_guid(rguidColumnType), + TRACE("(%p)->(%p, %p, %s, %08x, %s, %p)\n", This, pUnkOuter, pColumnID, debugstr_guid(rguidColumnType), dwBindFlags, debugstr_guid(riid), ppUnk); + if(pUnkOuter) + { + FIXME("Aggregation not supported\n"); + return CLASS_E_NOAGGREGATION; + } - return E_NOTIMPL; + return IWineRowServer_Open(This->server, pUnkOuter, pColumnID, rguidColumnType, dwBindFlags, riid, ppUnk); } static const IRowVtbl row_vtbl =

1 0

Huw Davies : msdaps: Make use of the row server in ICommand_Execute.
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: 06abf0006c7e4dfc41b4b3f76a97add655178b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=06abf0006c7e4dfc41b4b3f76… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 19:22:21 2010 +0000 msdaps: Make use of the row server in ICommand_Execute. --- dlls/msdaps/usrmarshal.c | 60 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index f889097..f08f9fc 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -766,11 +766,34 @@ HRESULT __RPC_STUB ICommand_Cancel_Stub(ICommand* This, IErrorInfo **ppErrorInfo HRESULT CALLBACK ICommand_Execute_Proxy(ICommand* This, IUnknown *pUnkOuter, REFIID riid, DBPARAMS *pParams, DBROWCOUNT *pcRowsAffected, IUnknown **ppRowset) { - FIXME("(%p)->(%p, %s, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), pParams, + HRESULT hr; + DBROWCOUNT affected; + + *ppRowset = NULL; + + TRACE("(%p)->(%p, %s, %p, %p, %p)\n", This, pUnkOuter, debugstr_guid(riid), pParams, pcRowsAffected, ppRowset); - if(pParams) TRACE("params {%p, %d, %08lx}\n", pParams->pData, pParams->cParamSets, pParams->hAccessor); - return E_NOTIMPL; + if(pParams) + { + FIXME("Unhandled params {%p, %d, %08lx}\n", pParams->pData, pParams->cParamSets, pParams->hAccessor); + return E_NOTIMPL; + } + + if(pUnkOuter) + { + FIXME("Aggregation not supported\n"); + return CLASS_E_NOAGGREGATION; + } + + hr = ICommand_RemoteExecute_Proxy(This, pUnkOuter, riid, 0, 0, NULL, 0, NULL, NULL, 0, NULL, NULL, &affected, + ppRowset); + + TRACE("Execute returns %08x\n", hr); + + if(pcRowsAffected) *pcRowsAffected = affected; + + return hr; } HRESULT __RPC_STUB ICommand_Execute_Stub(ICommand* This, IUnknown *pUnkOuter, REFIID riid, HACCESSOR hAccessor, @@ -778,10 +801,37 @@ HRESULT __RPC_STUB ICommand_Execute_Stub(ICommand* This, IUnknown *pUnkOuter, RE RMTPACK *pOutputParams, DBCOUNTITEM cBindings, DBBINDING *rgBindings, DBSTATUS *rgStatus, DBROWCOUNT *pcRowsAffected, IUnknown **ppRowset) { - FIXME("(%p)->(%p, %s, %08lx, %d, %p, %d, %p, %p, %d, %p, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), + IWineRowServer *rowset_server; + IMarshal *marshal; + IUnknown *obj = NULL; + HRESULT hr; + + TRACE("(%p)->(%p, %s, %08lx, %d, %p, %d, %p, %p, %d, %p, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), hAccessor, cParamSets, pGuid, ulGuidOffset, pInputParams, pOutputParams, cBindings, rgBindings, rgStatus, pcRowsAffected, ppRowset); - return E_NOTIMPL; + + *ppRowset = NULL; + + hr = CoCreateInstance(&CLSID_wine_rowset_server, NULL, CLSCTX_INPROC_SERVER, &IID_IWineRowServer, (void**)&rowset_server); + if(FAILED(hr)) return hr; + + IWineRowServer_GetMarshal(rowset_server, &marshal); + + hr = ICommand_Execute(This, (IUnknown*)marshal, &IID_IUnknown, NULL, pcRowsAffected, &obj); + + IMarshal_Release(marshal); + + if(FAILED(hr)) + { + IWineRowServer_Release(rowset_server); + return hr; + } + + IWineRowServer_SetInnerUnk(rowset_server, obj); + hr = IUnknown_QueryInterface(obj, riid, (void**)ppRowset); + IUnknown_Release(obj); + + return hr; } HRESULT CALLBACK ICommand_GetDBSession_Proxy(ICommand* This, REFIID riid, IUnknown **ppSession)

1 0

Huw Davies : msdaps: Make use of the row server in IBindResource_Bind.
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: 82d35b0bf22a05cb99854923db9e638126be52ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d35b0bf22a05cb99854923d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 15:22:29 2010 +0000 msdaps: Make use of the row server in IBindResource_Bind. --- dlls/msdaps/main.c | 1 + dlls/msdaps/usrmarshal.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c index 92ed78b..1312fc4 100644 --- a/dlls/msdaps/main.c +++ b/dlls/msdaps/main.c @@ -31,6 +31,7 @@ #include "winerror.h" #include "objbase.h" #include "oleauto.h" +#define DBINITCONSTANTS #include "oledb.h" #include "row_server.h" diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index a2cea91..f889097 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -448,6 +448,12 @@ HRESULT CALLBACK IBindResource_Bind_Proxy(IBindResource* This, IUnknown *pUnkOut TRACE("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p)\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, debugstr_guid(rguid), debugstr_guid(riid), pAuthenticate, pImplSession, pdwBindStatus, ppUnk); + if(pUnkOuter) + { + FIXME("Aggregation not supported\n"); + return CLASS_E_NOAGGREGATION; + } + hr = IBindResource_RemoteBind_Proxy(This, pUnkOuter, pwszURL, dwBindURLFlags, rguid, riid, pAuthenticate, pImplSession ? pImplSession->pUnkOuter : NULL, pImplSession ? pImplSession->piid : NULL, pImplSession ? &pImplSession->pSession : NULL, pdwBindStatus, ppUnk); @@ -460,16 +466,46 @@ HRESULT __RPC_STUB IBindResource_Bind_Stub(IBindResource* This, IUnknown *pUnkOu { HRESULT hr; DBIMPLICITSESSION impl_session; + IWineRowServer *server; + IMarshal *marshal; + IUnknown *obj; TRACE("(%p, %p, %s, %08x, %s, %s, %p, %p, %p, %p, %p, %p)\n", This, pUnkOuter, debugstr_w(pwszURL), dwBindURLFlags, debugstr_guid(rguid), debugstr_guid(riid), pAuthenticate, pSessionUnkOuter, piid, ppSession, pdwBindStatus, ppUnk); + *ppUnk = NULL; + + if(IsEqualGUID(rguid, &DBGUID_ROWSET)) + hr = CoCreateInstance(&CLSID_wine_rowset_server, NULL, CLSCTX_INPROC_SERVER, &IID_IWineRowServer, (void**)&server); + else if(IsEqualGUID(rguid, &DBGUID_ROW)) + hr = CoCreateInstance(&CLSID_wine_row_server, NULL, CLSCTX_INPROC_SERVER, &IID_IWineRowServer, (void**)&server); + else + { + hr = E_NOTIMPL; + FIXME("Unhandled object %s\n", debugstr_guid(rguid)); + } + + if(FAILED(hr)) return hr; + impl_session.pUnkOuter = pSessionUnkOuter; impl_session.piid = piid; impl_session.pSession = NULL; - hr = IBindResource_Bind(This, pUnkOuter, pwszURL, dwBindURLFlags, rguid, riid, pAuthenticate, - ppSession ? &impl_session : NULL, pdwBindStatus, ppUnk); + IWineRowServer_GetMarshal(server, &marshal); + + hr = IBindResource_Bind(This, (IUnknown*)marshal, pwszURL, dwBindURLFlags, rguid, &IID_IUnknown, pAuthenticate, + ppSession ? &impl_session : NULL, pdwBindStatus, &obj); + + IMarshal_Release(marshal); + if(FAILED(hr)) + { + IWineRowServer_Release(server); + return hr; + } + + IWineRowServer_SetInnerUnk(server, obj); + hr = IUnknown_QueryInterface(obj, riid, (void**)ppUnk); + IUnknown_Release(obj); if(ppSession) *ppSession = impl_session.pSession; return hr;

1 0

Huw Davies : msdaps: Add support for remoting IRowsetLocate_GetRowsAt.
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: 0ea0079abfe37612ef456db24e70aa9066cdf410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea0079abfe37612ef456db24… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 14:47:56 2010 +0000 msdaps: Add support for remoting IRowsetLocate_GetRowsAt. --- dlls/msdaps/row_server.c | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index c54ce47..26d0e13 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -332,11 +332,23 @@ static HRESULT WINAPI server_GetRowsAt(IWineRowServer *iface, HWATCHREGION hRese DBROWCOUNT cRows, DBCOUNTITEM *pcRowsObtained, HROW **prghRows) { server *This = impl_from_IWineRowServer(iface); + IRowsetLocate *rowsetlocate; + HRESULT hr; - FIXME("(%p)->(%08lx, %08lx, %d, %p, %d, %d, %p, %p): stub\n", This, hReserved1, hReserved2, cbBookmark, pBookmark, - lRowsOffset, cRows, pcRowsObtained, prghRows); + TRACE("(%p)->(%08lx, %08lx, %d, %p, %d, %d, %p, %p\n", This, hReserved1, hReserved2, cbBookmark, pBookmark, lRowsOffset, cRows, + pcRowsObtained, prghRows); - return E_NOTIMPL; + *prghRows = NULL; + + hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowsetLocate, (void**)&rowsetlocate); + if(FAILED(hr)) return hr; + + hr = IRowsetLocate_GetRowsAt(rowsetlocate, hReserved1, hReserved2, cbBookmark, pBookmark, lRowsOffset, + cRows, pcRowsObtained, prghRows); + IRowsetLocate_Release(rowsetlocate); + + TRACE("returning %08x\n", hr); + return hr; } static HRESULT WINAPI server_GetRowsByBookmark(IWineRowServer *iface, HCHAPTER hReserved, DBCOUNTITEM cRows, @@ -1006,8 +1018,23 @@ static HRESULT WINAPI rowsetlocate_GetRowsAt(IRowsetLocate *iface, HWATCHREGION HROW **prghRows) { rowset_proxy *This = impl_from_IRowsetLocate(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + HRESULT hr; + HROW *rows = NULL; + + TRACE("(%p)->(%08lx, %08lx, %d, %p, %d, %d, %p, %p\n", This, hReserved1, hReserved2, cbBookmark, pBookmark, lRowsOffset, cRows, + pcRowsObtained, prghRows); + + hr = IWineRowServer_GetRowsAt(This->server, hReserved1, hReserved2, cbBookmark, pBookmark, lRowsOffset, cRows, pcRowsObtained, &rows); + + if(*prghRows) + { + memcpy(*prghRows, rows, *pcRowsObtained * sizeof(rows[0])); + CoTaskMemFree(rows); + } + else + *prghRows = rows; + + return hr; } static HRESULT WINAPI rowsetlocate_GetRowsByBookmark(IRowsetLocate *iface, HCHAPTER hReserved, DBCOUNTITEM cRows, const DBBKMARK rgcbBookmarks[],

1 0

Huw Davies : msdaps: Add support for remoting IRowset_GetData.
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: 8c5f4f082215a6d2976bc173b753730bcae66e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5f4f082215a6d2976bc173b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 14:34:17 2010 +0000 msdaps: Add support for remoting IRowset_GetData. --- dlls/msdaps/row_server.c | 52 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 24cb367..c54ce47 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -257,8 +257,19 @@ static HRESULT WINAPI server_GetData(IWineRowServer* iface, HROW hRow, HACCESSOR hAccessor, BYTE *pData, DWORD size) { server *This = impl_from_IWineRowServer(iface); - FIXME("(%p)->(%08lx, %08lx, %p, %d): stub\n", This, hRow, hAccessor, pData, size); - return E_NOTIMPL; + IRowset *rowset; + HRESULT hr; + + TRACE("(%p)->(%08lx, %08lx, %p, %d)\n", This, hRow, hAccessor, pData, size); + + hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowset, (void**)&rowset); + if(FAILED(hr)) return hr; + + hr = IRowset_GetData(rowset, hRow, hAccessor, pData); + + IRowset_Release(rowset); + TRACE("returning %08x\n", hr); + return hr; } static HRESULT WINAPI server_GetNextRows(IWineRowServer* iface, HCHAPTER hReserved, DBROWOFFSET lRowsOffset, @@ -822,10 +833,43 @@ static HRESULT WINAPI rowset_AddRefRows(IRowset *iface, DBCOUNTITEM cRows, const static HRESULT WINAPI rowset_GetData(IRowset *iface, HROW hRow, HACCESSOR hAccessor, void *pData) { rowset_proxy *This = impl_from_IRowset(iface); + HRESULT hr; + IAccessor *accessor; + DBACCESSORFLAGS flags; + DBCOUNTITEM count, i; + DBBINDING *bindings; + DWORD max_len = 0; - FIXME("(%p)->(%lx, %lx, %p): stub\n", This, hRow, hAccessor, pData); + TRACE("(%p)->(%lx, %lx, %p)\n", This, hRow, hAccessor, pData); - return E_NOTIMPL; + hr = IRowset_QueryInterface(iface, &IID_IAccessor, (void**)&accessor); + if(FAILED(hr)) return hr; + + hr = IAccessor_GetBindings(accessor, hAccessor, &flags, &count, &bindings); + IAccessor_Release(accessor); + if(FAILED(hr)) return hr; + + TRACE("got %d bindings\n", count); + for(i = 0; i < count; i++) + { + TRACE("%d\tord %d offs: val %d len %d stat %d, part %x, max len %d type %04x\n", + i, bindings[i].iOrdinal, bindings[i].obValue, bindings[i].obLength, bindings[i].obStatus, + bindings[i].dwPart, bindings[i].cbMaxLen, bindings[i].wType); + if(bindings[i].dwPart & DBPART_LENGTH && bindings[i].obLength >= max_len) + max_len = bindings[i].obLength + sizeof(DBLENGTH); + if(bindings[i].dwPart & DBPART_STATUS && bindings[i].obStatus >= max_len) + max_len = bindings[i].obStatus + sizeof(DWORD); + if(bindings[i].dwPart & DBPART_VALUE && bindings[i].obValue >= max_len) + max_len = bindings[i].obValue + db_type_size(bindings[i].wType, bindings[i].cbMaxLen); + + } + TRACE("max_len %d\n", max_len); + + CoTaskMemFree(bindings); + + hr = IWineRowServer_GetData(This->server, hRow, hAccessor, pData, max_len); + + return hr; } static HRESULT WINAPI rowset_GetNextRows(IRowset *iface, HCHAPTER hReserved, DBROWOFFSET lRowsOffset,

1 0

Huw Davies : msdaps: Add support for remoting IRowsetInfo_GetProperties.
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: a437cc25d48ec06b13a5adbca6a8b7f9607def60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a437cc25d48ec06b13a5adbca… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 4 14:21:30 2010 +0000 msdaps: Add support for remoting IRowsetInfo_GetProperties. --- dlls/msdaps/row_server.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index d220893..24cb367 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -351,8 +351,19 @@ static HRESULT WINAPI server_GetProperties(IWineRowServer* iface, ULONG cPropert DBPROPSET **prgPropertySets) { server *This = impl_from_IWineRowServer(iface); - FIXME("(%p)->(%d, %p, %p, %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); - return E_NOTIMPL; + IRowsetInfo *rowsetinfo; + HRESULT hr; + + TRACE("(%p)->(%d, %p, %p, %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + + hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowsetInfo, (void**)&rowsetinfo); + if(FAILED(hr)) return hr; + + hr = IRowsetInfo_GetProperties(rowsetinfo, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + IRowsetInfo_Release(rowsetinfo); + + TRACE("returning %08x\n", hr); + return hr; } static HRESULT WINAPI server_GetReferencedRowset(IWineRowServer* iface, DBORDINAL iOrdinal, @@ -1010,8 +1021,13 @@ static HRESULT WINAPI rowsetinfo_GetProperties(IRowsetInfo *iface, const ULONG c DBPROPSET **prgPropertySets) { rowset_proxy *This = impl_from_IRowsetInfo(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%d, %p, %p, %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + + hr = IWineRowServer_GetProperties(This->server, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + + return hr; } static HRESULT WINAPI rowsetinfo_GetReferencedRowset(IRowsetInfo *iface, DBORDINAL iOrdinal, REFIID riid,

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
79
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 February 2010