Skip to content

W
wine-winehq
Commit a5549305 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

msi: Update the UI in the RemoveODBC action.

parent eff0503f
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 0 deletions
dlls/msi/action.c
View file @ a5549305
...@@ -5723,6 +5723,8 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) ...@@ -5723,6 +5723,8 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package )
static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param )
{ {
MSIPACKAGE *package = param;
MSIRECORD *uirow;
DWORD usage; DWORD usage;
LPCWSTR desc; LPCWSTR desc;
...@@ -5736,11 +5738,19 @@ static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) ...@@ -5736,11 +5738,19 @@ static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param )
FIXME("Usage count reached 0\n"); 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; return ERROR_SUCCESS;
} }
static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param )
{ {
MSIPACKAGE *package = param;
MSIRECORD *uirow;
DWORD usage; DWORD usage;
LPCWSTR desc; LPCWSTR desc;
...@@ -5754,11 +5764,19 @@ static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) ...@@ -5754,11 +5764,19 @@ static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param )
FIXME("Usage count reached 0\n"); 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; return ERROR_SUCCESS;
} }
static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param )
{ {
MSIPACKAGE *package = param;
MSIRECORD *uirow;
LPWSTR attrs; LPWSTR attrs;
LPCWSTR desc, driver; LPCWSTR desc, driver;
WORD request = ODBC_REMOVE_SYS_DSN; WORD request = ODBC_REMOVE_SYS_DSN;
...@@ -5791,6 +5809,13 @@ static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) ...@@ -5791,6 +5809,13 @@ static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param )
} }
msi_free( attrs ); 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; return ERROR_SUCCESS;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment