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

Hans Leidekker : msi: Update the UI in the AppSearch action.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: 868e6f2bc8d44b0712003ce2c67d67acd8ea999e URL: http://source.winehq.org/git/wine.git/?a=commit;h=868e6f2bc8d44b0712003ce2c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:23:53 2010 +0100 msi: Update the UI in the AppSearch action. --- dlls/msi/appsearch.c | 16 +++++++++++----- dlls/msi/msipriv.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index c4e4e58..12c7411 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -1026,13 +1026,15 @@ static UINT ACTION_AppSearchSigName(MSIPACKAGE *package, LPCWSTR sigName, static UINT iterate_appsearch(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; - LPWSTR propName, sigName, value = NULL; + LPCWSTR propName, sigName; + LPWSTR value = NULL; MSISIGNATURE sig; + MSIRECORD *uirow; UINT r; /* get property and signature */ - propName = msi_dup_record_field(row,1); - sigName = msi_dup_record_field(row,2); + propName = MSI_RecordGetString(row, 1); + sigName = MSI_RecordGetString(row, 2); TRACE("%s %s\n", debugstr_w(propName), debugstr_w(sigName)); @@ -1043,8 +1045,12 @@ static UINT iterate_appsearch(MSIRECORD *row, LPVOID param) msi_free(value); } ACTION_FreeSignature(&sig); - msi_free(propName); - msi_free(sigName); + + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, propName ); + MSI_RecordSetStringW( uirow, 2, sigName ); + ui_actiondata( package, szAppSearch, uirow ); + msiobj_release( &uirow->hdr ); return r; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9e2ffe2..97d79c4 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1081,6 +1081,7 @@ static const WCHAR szHCU[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_ static const WCHAR szHLM[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\',0}; static const WCHAR szHU[] = {'H','K','E','Y','_','U','S','E','R','S','\\',0}; static const WCHAR szWindowsFolder[] = {'W','i','n','d','o','w','s','F','o','l','d','e','r',0}; +static const WCHAR szAppSearch[] = {'A','p','p','S','e','a','r','c','h',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0

Hans Leidekker : msi: Display directory identifier instead of the full path in the CreateFolders action .
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: a70d86d3c9079a6fd93b66e0f3c54eb2ff2d68b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70d86d3c9079a6fd93b66e0f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:24:18 2010 +0100 msi: Display directory identifier instead of the full path in the CreateFolders action. --- dlls/msi/action.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a39ddad..e321099 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -92,8 +92,6 @@ static const WCHAR szForceReboot[] = {'F','o','r','c','e','R','e','b','o','o','t',0}; static const WCHAR szResolveSource[] = {'R','e','s','o','l','v','e','S','o','u','r','c','e',0}; -static const WCHAR szAppSearch[] = - {'A','p','p','S','e','a','r','c','h',0}; static const WCHAR szAllocateRegistrySpace[] = {'A','l','l','o','c','a','t','e','R','e','g','i','s','t','r','y','S','p','a','c','e',0}; static const WCHAR szBindImage[] = @@ -910,6 +908,11 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } + uirow = MSI_CreateRecord(1); + MSI_RecordSetStringW(uirow, 1, dir); + ui_actiondata(package, szCreateFolders, uirow); + msiobj_release(&uirow->hdr); + full_path = resolve_folder(package,dir,FALSE,FALSE,TRUE,&folder); if (!full_path) { @@ -919,12 +922,6 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) TRACE("Folder is %s\n",debugstr_w(full_path)); - /* UI stuff */ - uirow = MSI_CreateRecord(1); - MSI_RecordSetStringW(uirow,1,full_path); - ui_actiondata(package,szCreateFolders,uirow); - msiobj_release( &uirow->hdr ); - if (folder->State == 0) create_full_pathW(full_path);

1 0

Hans Leidekker : msi: Update the UI in the DeleteServices action.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: 3c36d9d1f956e51f7b8764f63232ae7c45c3f68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c36d9d1f956e51f7b8764f63… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:24:41 2010 +0100 msi: Update the UI in the DeleteServices action. --- dlls/msi/action.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e321099..7a666f5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5383,9 +5383,10 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; MSICOMPONENT *comp; + MSIRECORD *uirow; LPCWSTR component; - LPWSTR name = NULL; - DWORD event; + LPWSTR name = NULL, display_name = NULL; + DWORD event, len; SC_HANDLE scm = NULL, service = NULL; event = MSI_RecordGetInteger( rec, 3 ); @@ -5415,6 +5416,14 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) goto done; } + len = 0; + if (!GetServiceDisplayNameW( scm, name, NULL, &len ) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if ((display_name = msi_alloc( ++len * sizeof(WCHAR )))) + GetServiceDisplayNameW( scm, name, display_name, &len ); + } + service = OpenServiceW( scm, name, DELETE ); if (!service) { @@ -5426,9 +5435,16 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) WARN("Failed to delete service (%s): %u\n", debugstr_w(name), GetLastError()); done: + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, display_name ); + MSI_RecordSetStringW( uirow, 2, name ); + ui_actiondata( package, szDeleteServices, uirow ); + msiobj_release( &uirow->hdr ); + CloseServiceHandle( service ); CloseServiceHandle( scm ); msi_free( name ); + msi_free( display_name ); return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Properly update the UI in the DuplicateFiles and RemoveDuplicateFiles actions .
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: 2666294f649f2e79fdf4e0f5ef64ccbe4c5d1160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2666294f649f2e79fdf4e0f5e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:25:07 2010 +0100 msi: Properly update the UI in the DuplicateFiles and RemoveDuplicateFiles actions. --- dlls/msi/files.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index aaaa7c1..c55bbfa 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -386,6 +386,7 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) LPWSTR dest; LPCWSTR file_key, component; MSICOMPONENT *comp; + MSIRECORD *uirow; MSIFILE *file; component = MSI_RecordGetString(row,2); @@ -432,7 +433,12 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) FIXME("We should track these duplicate files as well\n"); - msi_file_update_ui(package, file, szDuplicateFiles); + uirow = MSI_CreateRecord( 9 ); + MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString( row, 1 ) ); + MSI_RecordSetInteger( uirow, 6, file->FileSize ); + MSI_RecordSetStringW( uirow, 9, MSI_RecordGetString( row, 5 ) ); + ui_actiondata( package, szDuplicateFiles, uirow ); + msiobj_release( &uirow->hdr ); msi_free(dest); return ERROR_SUCCESS; @@ -462,6 +468,7 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param ) LPWSTR dest; LPCWSTR file_key, component; MSICOMPONENT *comp; + MSIRECORD *uirow; MSIFILE *file; component = MSI_RecordGetString( row, 2 ); @@ -505,7 +512,11 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param ) WARN("Failed to delete duplicate file %s (%u)\n", debugstr_w(dest), GetLastError()); } - msi_file_update_ui( package, file, szRemoveDuplicateFiles ); + uirow = MSI_CreateRecord( 9 ); + MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString( row, 1 ) ); + MSI_RecordSetStringW( uirow, 9, MSI_RecordGetString( row, 5 ) ); + ui_actiondata( package, szRemoveDuplicateFiles, uirow ); + msiobj_release( &uirow->hdr ); msi_free(dest); return ERROR_SUCCESS;

1 0

Hans Leidekker : msi: Display the product code in the FindRelatedProducts action.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: bb9451adaef98108ec13b2fae116ee8357554ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9451adaef98108ec13b2fae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:25:31 2010 +0100 msi: Display the product code in the FindRelatedProducts action. --- dlls/msi/upgrade.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index 21b677d..a440070 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -182,9 +182,10 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) continue; } - action_property = MSI_RecordGetString(rec,7); - append_productcode(package,action_property,productid); - ui_actiondata(package,szFindRelatedProducts,uirow); + action_property = MSI_RecordGetString(rec, 7); + append_productcode(package, action_property, productid); + MSI_RecordSetStringW(uirow, 1, productid); + ui_actiondata(package, szFindRelatedProducts, uirow); } index ++; }

1 0

Hans Leidekker : msi: Update the UI in the InstallODBC action.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: eff0503f644ddccb5b27328f04e4607bc4c1c497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff0503f644ddccb5b27328f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:25:55 2010 +0100 msi: Update the UI in the InstallODBC action. --- dlls/msi/action.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7a666f5..59b756a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5487,6 +5487,7 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) LPWSTR driver, driver_path, ptr; WCHAR outpath[MAX_PATH]; MSIFILE *driver_file, *setup_file; + MSIRECORD *uirow; LPCWSTR desc; DWORD len, usage; UINT r = ERROR_SUCCESS; @@ -5546,6 +5547,13 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) r = ERROR_FUNCTION_FAILED; } + uirow = MSI_CreateRecord( 5 ); + MSI_RecordSetStringW( uirow, 1, desc ); + MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); + MSI_RecordSetStringW( uirow, 3, driver_path ); + ui_actiondata( package, szInstallODBC, uirow ); + msiobj_release( &uirow->hdr ); + msi_free(driver); msi_free(driver_path); @@ -5558,6 +5566,7 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) LPWSTR translator, translator_path, ptr; WCHAR outpath[MAX_PATH]; MSIFILE *translator_file, *setup_file; + MSIRECORD *uirow; LPCWSTR desc; DWORD len, usage; UINT r = ERROR_SUCCESS; @@ -5611,6 +5620,13 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) r = ERROR_FUNCTION_FAILED; } + uirow = MSI_CreateRecord( 5 ); + MSI_RecordSetStringW( uirow, 1, desc ); + MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); + MSI_RecordSetStringW( uirow, 3, translator_path ); + ui_actiondata( package, szInstallODBC, uirow ); + msiobj_release( &uirow->hdr ); + msi_free(translator); msi_free(translator_path); @@ -5619,12 +5635,14 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) { + MSIPACKAGE *package = param; LPWSTR attrs; LPCWSTR desc, driver; WORD request = ODBC_ADD_SYS_DSN; INT registration; DWORD len; UINT r = ERROR_SUCCESS; + MSIRECORD *uirow; static const WCHAR attrs_fmt[] = { 'D','S','N','=','%','s',0 }; @@ -5650,6 +5668,13 @@ static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) r = ERROR_FUNCTION_FAILED; } + uirow = MSI_CreateRecord( 5 ); + MSI_RecordSetStringW( uirow, 1, desc ); + MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); + MSI_RecordSetInteger( uirow, 3, request ); + ui_actiondata( package, szInstallODBC, uirow ); + msiobj_release( &uirow->hdr ); + msi_free(attrs); return r;

1 0

Hans Leidekker : msi: Update the UI in the RemoveODBC action.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: a5549305deafdbe7ebf4b1578ec76f86ace0467a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5549305deafdbe7ebf4b1578… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:26:21 2010 +0100 msi: Update the UI in the RemoveODBC action. --- dlls/msi/action.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 59b756a..897e9c9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5723,6 +5723,8 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) { + MSIPACKAGE *package = param; + MSIRECORD *uirow; DWORD usage; LPCWSTR desc; @@ -5736,11 +5738,19 @@ static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) FIXME("Usage count reached 0\n"); } + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, desc ); + MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); + ui_actiondata( package, szRemoveODBC, uirow ); + msiobj_release( &uirow->hdr ); + return ERROR_SUCCESS; } static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) { + MSIPACKAGE *package = param; + MSIRECORD *uirow; DWORD usage; LPCWSTR desc; @@ -5754,11 +5764,19 @@ static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) FIXME("Usage count reached 0\n"); } + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, desc ); + MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); + ui_actiondata( package, szRemoveODBC, uirow ); + msiobj_release( &uirow->hdr ); + return ERROR_SUCCESS; } static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) { + MSIPACKAGE *package = param; + MSIRECORD *uirow; LPWSTR attrs; LPCWSTR desc, driver; WORD request = ODBC_REMOVE_SYS_DSN; @@ -5791,6 +5809,13 @@ static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) } msi_free( attrs ); + uirow = MSI_CreateRecord( 3 ); + MSI_RecordSetStringW( uirow, 1, desc ); + MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); + MSI_RecordSetInteger( uirow, 3, request ); + ui_actiondata( package, szRemoveODBC, uirow ); + msiobj_release( &uirow->hdr ); + return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Move the implementation of the MoveFiles action to files.c.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: aba6afc85eea0bad16c7478ce2a1f5cd88bda587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba6afc85eea0bad16c7478ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:26:41 2010 +0100 msi: Move the implementation of the MoveFiles action to files.c. --- dlls/msi/action.c | 336 ---------------------------------------------------- dlls/msi/files.c | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msipriv.h | 1 + 3 files changed, 337 insertions(+), 336 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aba6afc85eea0bad16c74…

1 0

Hans Leidekker : msi: Update the UI in the MoveFiles action.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: a358c7f6d4c33589681c9b2d9302c925ca75d560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a358c7f6d4c33589681c9b2d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:27:07 2010 +0100 msi: Update the UI in the MoveFiles action. --- dlls/msi/action.c | 2 -- dlls/msi/files.c | 14 ++++++++++---- dlls/msi/msipriv.h | 1 + 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cabd153..276250f 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -112,8 +112,6 @@ static const WCHAR szIsolateComponents[] = {'I','s','o','l','a','t','e','C','o','m','p','o','n','e','n','t','s',0}; static const WCHAR szMigrateFeatureStates[] = {'M','i','g','r','a','t','e','F','e','a','t','u','r','e','S','t','a','t','e','s',0}; -static const WCHAR szMoveFiles[] = - {'M','o','v','e','F','i','l','e','s',0}; static const WCHAR szMsiPublishAssemblies[] = {'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; static const WCHAR szMsiUnpublishAssemblies[] = diff --git a/dlls/msi/files.c b/dlls/msi/files.c index bf6f1fa..7ccb2c7 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -531,11 +531,10 @@ done: static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; + MSIRECORD *uirow; MSICOMPONENT *comp; LPCWSTR sourcename, component; - LPWSTR destname = NULL; - LPWSTR sourcedir = NULL, destdir = NULL; - LPWSTR source = NULL, dest = NULL; + LPWSTR sourcedir, destname = NULL, destdir = NULL, source = NULL, dest = NULL; int options; DWORD size; BOOL ret, wildcards; @@ -626,7 +625,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) if (!ret) { WARN("CreateDirectory failed: %d\n", GetLastError()); - return ERROR_SUCCESS; + goto done; } } @@ -636,6 +635,13 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) move_files_wildcard(source, dest, options); done: + uirow = MSI_CreateRecord( 9 ); + MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString(rec, 1) ); + MSI_RecordSetInteger( uirow, 6, 1 ); /* FIXME */ + MSI_RecordSetStringW( uirow, 9, destdir ); + ui_actiondata( package, szMoveFiles, uirow ); + msiobj_release( &uirow->hdr ); + msi_free(sourcedir); msi_free(destdir); msi_free(destname); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 07ee1a8..0516dd1 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1083,6 +1083,7 @@ static const WCHAR szHLM[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A static const WCHAR szHU[] = {'H','K','E','Y','_','U','S','E','R','S','\\',0}; static const WCHAR szWindowsFolder[] = {'W','i','n','d','o','w','s','F','o','l','d','e','r',0}; static const WCHAR szAppSearch[] = {'A','p','p','S','e','a','r','c','h',0}; +static const WCHAR szMoveFiles[] = {'M','o','v','e','F','i','l','e','s',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0

Stefan Dösinger : wined3d: Add wined3d_event_query_create and destroy.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: bd0641d37fec8cc50d6f6774da30995757f5eaec URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd0641d37fec8cc50d6f6774d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 3 23:48:50 2010 +0100 wined3d: Add wined3d_event_query_create and destroy. This also moves the event query faking code back to the external interface and removes the temporary WINED3D_EVENT_QUERY_UNSUPPORTED return value since wined3d_event_query_create properly fails if no event query GL extension is supported. --- dlls/wined3d/query.c | 61 ++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 3 +- 2 files changed, 45 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 09a60bd..3860e2c 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -27,6 +27,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION (*gl_info) +static HRESULT wined3d_event_query_init(const struct wined3d_gl_info *gl_info, struct wined3d_event_query **query) +{ + struct wined3d_event_query *ret; + *query = NULL; + if (!gl_info->supported[ARB_SYNC] && !gl_info->supported[NV_FENCE] + && !gl_info->supported[APPLE_FENCE]) return E_NOTIMPL; + + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(*ret)); + if (!ret) + { + ERR("Failed to allocate a wined3d event query structure.\n"); + return E_OUTOFMEMORY; + } + ret->context = NULL; + *query = ret; + return WINED3D_OK; +} + +static void wined3d_event_query_destroy(struct wined3d_event_query *query) +{ + if (query->context) context_free_event_query(query); + HeapFree(GetProcessHeap(), 0, query); +} + static enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) { struct wined3d_context *context; @@ -91,7 +115,8 @@ static enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_e } else { - ret = WINED3D_EVENT_QUERY_UNSUPPORTED; + ERR("Event query created despite lack of GL support\n"); + ret = WINED3D_EVENT_QUERY_ERROR; } LEAVE_GL(); @@ -194,17 +219,16 @@ static ULONG WINAPI IWineD3DQueryImpl_Release(IWineD3DQuery *iface) { if (This->type == WINED3DQUERYTYPE_EVENT) { struct wined3d_event_query *query = This->extendedData; - - if (query->context) context_free_event_query(query); + if (query) wined3d_event_query_destroy(query); } else if (This->type == WINED3DQUERYTYPE_OCCLUSION) { struct wined3d_occlusion_query *query = This->extendedData; if (query->context) context_free_occlusion_query(query); + HeapFree(GetProcessHeap(), 0, This->extendedData); } - HeapFree(GetProcessHeap(), 0, This->extendedData); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -309,6 +333,12 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void TRACE("(%p) : type D3DQUERY_EVENT, pData %p, dwSize %#x, dwGetDataFlags %#x\n", This, pData, dwSize, dwGetDataFlags); if (!pData || !dwSize) return S_OK; + if (!query) + { + WARN("(%p): Event query not supported by GL, reporting GPU idle\n", This); + *data = TRUE; + return S_OK; + } ret = wined3d_event_query_test(query, This->device); switch(ret) @@ -327,11 +357,6 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void *data = TRUE; break; - case WINED3D_EVENT_QUERY_UNSUPPORTED: - WARN("(%p): Event query not supported by GL, reporting GPU idle\n", This); - *data = TRUE; - break; - case WINED3D_EVENT_QUERY_ERROR: ERR("The GL event query failed, returning D3DERR_INVALIDCALL\n"); return WINED3DERR_INVALIDCALL; @@ -364,6 +389,10 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_Issue(IWineD3DQuery* iface, DWORD if (dwIssueFlags & WINED3DISSUE_END) { struct wined3d_event_query *query = This->extendedData; + + /* Faked event query support */ + if (!query) return WINED3D_OK; + wined3d_event_query_issue(query, This->device); } else if(dwIssueFlags & WINED3DISSUE_BEGIN) @@ -496,6 +525,7 @@ HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type, IUnknown *parent) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + HRESULT hr; switch (type) { @@ -518,8 +548,9 @@ HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, case WINED3DQUERYTYPE_EVENT: TRACE("Event query.\n"); - if (!gl_info->supported[ARB_SYNC] && !gl_info->supported[NV_FENCE] - && !gl_info->supported[APPLE_FENCE]) + query->lpVtbl = &IWineD3DEventQuery_Vtbl; + hr = wined3d_event_query_init(gl_info, (struct wined3d_event_query **) &query->extendedData); + if (hr == E_NOTIMPL) { /* Half-Life 2 needs this query. It does not render the main * menu correctly otherwise. Pretend to support it, faking @@ -527,14 +558,10 @@ HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, * lowering performance. */ FIXME("Event query: Unimplemented, but pretending to be supported.\n"); } - query->lpVtbl = &IWineD3DEventQuery_Vtbl; - query->extendedData = HeapAlloc(GetProcessHeap(), 0, sizeof(struct wined3d_event_query)); - if (!query->extendedData) + else if(FAILED(hr)) { - ERR("Failed to allocate event query extended data.\n"); - return E_OUTOFMEMORY; + return hr; } - ((struct wined3d_event_query *)query->extendedData)->context = NULL; break; case WINED3DQUERYTYPE_VCACHE: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 616a391..1d5cd97 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1036,8 +1036,7 @@ enum wined3d_event_query_result WINED3D_EVENT_QUERY_WAITING, WINED3D_EVENT_QUERY_NOT_STARTED, WINED3D_EVENT_QUERY_WRONG_THREAD, - WINED3D_EVENT_QUERY_ERROR, - WINED3D_EVENT_QUERY_UNSUPPORTED + WINED3D_EVENT_QUERY_ERROR }; struct wined3d_context

1 0