August 2017 - Wine-commits - list.winehq.org

Zebediah Figura : msi: Return the current date and time.
by Alexandre Julliard 08 Aug '17

08 Aug '17

1 0

Zebediah Figura : msi: Return the correct values from dialogs.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 700ebc86a9ffd12028692fe8f2217c5d85fe82ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=700ebc86a9ffd12028692fe8f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 23 15:50:56 2017 -0500 msi: Return the correct values from dialogs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 3 --- dlls/msi/dialog.c | 53 ++++++++++++++++++++++++++---------------------- dlls/msi/msipriv.h | 3 +-- dlls/msi/package.c | 4 ++-- dlls/msi/tests/package.c | 6 ++---- 5 files changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 18ec7c3..b521925 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -498,9 +498,6 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) msi_dialog_check_messages( NULL ); - if (package->CurrentInstallState != ERROR_SUCCESS) - rc = package->CurrentInstallState; - if (rc == ERROR_FUNCTION_NOT_CALLED) rc = ERROR_SUCCESS; diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 0c46efd..1d24acd 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -103,6 +103,7 @@ struct msi_dialog_tag LPWSTR control_cancel; event_handler pending_event; LPWSTR pending_argument; + INT retval; WCHAR name[1]; }; @@ -4245,10 +4246,11 @@ struct control_event static UINT dialog_event_handler( msi_dialog *, const WCHAR *, const WCHAR * ); /* create a dialog box and run it if it's modal */ -static UINT event_do_dialog( MSIPACKAGE *package, const WCHAR *name, msi_dialog *parent, BOOL destroy_modeless ) +static INT event_do_dialog( MSIPACKAGE *package, const WCHAR *name, msi_dialog *parent, BOOL destroy_modeless ) { msi_dialog *dialog; UINT r; + INT retval; /* create a new dialog */ dialog = dialog_create( package, name, parent, dialog_event_handler ); @@ -4264,12 +4266,18 @@ static UINT event_do_dialog( MSIPACKAGE *package, const WCHAR *name, msi_dialog /* modeless dialogs return an error message */ r = dialog_run_message_loop( dialog ); if (r == ERROR_SUCCESS) + { + retval = dialog->retval; msi_dialog_destroy( dialog ); + return retval; + } else + { package->dialog = dialog; + return IDOK; + } } - else r = ERROR_FUNCTION_FAILED; - return r; + else return 0; } /* end a modal dialog box */ @@ -4281,17 +4289,17 @@ static UINT event_end_dialog( msi_dialog *dialog, const WCHAR *argument ) static const WCHAR returnW[] = {'R','e','t','u','r','n',0}; if (!strcmpW( argument, exitW )) - dialog->package->CurrentInstallState = ERROR_INSTALL_USEREXIT; + dialog->retval = IDCANCEL; else if (!strcmpW( argument, retryW )) - dialog->package->CurrentInstallState = ERROR_INSTALL_SUSPEND; + dialog->retval = IDRETRY; else if (!strcmpW( argument, ignoreW )) - dialog->package->CurrentInstallState = ERROR_SUCCESS; + dialog->retval = IDOK; else if (!strcmpW( argument, returnW )) - dialog->package->CurrentInstallState = ERROR_SUCCESS; + dialog->retval = 0; else { ERR("Unknown argument string %s\n", debugstr_w(argument)); - dialog->package->CurrentInstallState = ERROR_FUNCTION_FAILED; + dialog->retval = IDABORT; } event_cleanup_subscriptions( dialog->package, dialog->name ); msi_dialog_end_dialog( dialog ); @@ -4327,10 +4335,14 @@ static UINT pending_event_new_dialog( msi_dialog *dialog, const WCHAR *argument /* create a new child dialog of an existing modal dialog */ static UINT event_spawn_dialog( msi_dialog *dialog, const WCHAR *argument ) { + INT r; /* don't destroy a modeless dialogs that might be our parent */ - event_do_dialog( dialog->package, argument, dialog, FALSE ); - if (dialog->package->CurrentInstallState != ERROR_SUCCESS) + r = event_do_dialog( dialog->package, argument, dialog, FALSE ); + if (r != 0) + { + dialog->retval = r; msi_dialog_end_dialog( dialog ); + } else msi_dialog_update_all_controls(dialog); @@ -4472,26 +4484,20 @@ INT ACTION_ShowDialog( MSIPACKAGE *package, const WCHAR *dialog ) return rc; } -/* Return ERROR_SUCCESS if dialog is process and ERROR_FUNCTION_FAILED - * if the given parameter is not a dialog box - */ -UINT ACTION_DialogBox( MSIPACKAGE *package, const WCHAR *dialog ) +INT ACTION_DialogBox( MSIPACKAGE *package, const WCHAR *dialog ) { - UINT r; + INT r; if (package->next_dialog) ERR("Already got next dialog... ignoring it\n"); package->next_dialog = NULL; - /* Dialogs are chained by filling in the next_dialog member - * of the package structure, then terminating the current dialog. - * The code below sees the next_dialog member set, and runs the - * next dialog. - * We fall out of the loop below if we come across a modeless - * dialog, as it returns ERROR_IO_PENDING when we try to run - * its message loop. + /* Dialogs are chained through NewDialog, which sets the next_dialog member. + * We fall out of the loop if we reach a modeless dialog, which immediately + * returns IDOK, or an EndDialog event, which returns the value corresponding + * to its argument. */ r = event_do_dialog( package, dialog, NULL, TRUE ); - while (r == ERROR_SUCCESS && package->next_dialog) + while (package->next_dialog) { WCHAR *name = package->next_dialog; @@ -4499,7 +4505,6 @@ UINT ACTION_DialogBox( MSIPACKAGE *package, const WCHAR *dialog ) r = event_do_dialog( package, name, NULL, TRUE ); msi_free( name ); } - if (r == ERROR_IO_PENDING) r = ERROR_SUCCESS; return r; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 1400603..f316c0c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -414,7 +414,6 @@ typedef struct tagMSIPACKAGE BOOL delete_on_close; INSTALLUILEVEL ui_level; - UINT CurrentInstallState; msi_dialog *dialog; LPWSTR next_dialog; float center_x; @@ -803,7 +802,7 @@ extern void msi_free_patchinfo( MSIPATCHINFO *patch ) DECLSPEC_HIDDEN; /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ) DECLSPEC_HIDDEN; extern INT ACTION_ShowDialog( MSIPACKAGE*, LPCWSTR) DECLSPEC_HIDDEN; -extern UINT ACTION_DialogBox( MSIPACKAGE*, LPCWSTR) DECLSPEC_HIDDEN; +extern INT ACTION_DialogBox( MSIPACKAGE*, LPCWSTR) DECLSPEC_HIDDEN; extern UINT ACTION_ForceReboot(MSIPACKAGE *package) DECLSPEC_HIDDEN; extern UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable ) DECLSPEC_HIDDEN; extern UINT MSI_SetFeatureStates( MSIPACKAGE *package ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index cc3ee35..4716461 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1767,9 +1767,9 @@ static INT internal_ui_handler(MSIPACKAGE *package, INSTALLMESSAGE eMessageType, case INSTALLMESSAGE_SHOWDIALOG: { LPWSTR dialog = msi_dup_record_field(record, 0); - UINT rc = ACTION_DialogBox(package, dialog); + INT rc = ACTION_DialogBox(package, dialog); msi_free(dialog); - return (rc == ERROR_SUCCESS); + return rc; } case INSTALLMESSAGE_ACTIONSTART: { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 32af6a1..c10488a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9806,14 +9806,12 @@ static void test_controlevent(void) ok_sequence(openpackage_sequence, "MsiOpenPackage()", FALSE); r = MsiDoActionA(hpkg, "spawn"); - todo_wine ok(r == ERROR_INSTALL_USEREXIT, "expected ERROR_INSTALL_USEREXIT, got %u\n", r); - ok_sequence(controlevent_spawn_sequence, "control event: spawn", TRUE); + ok_sequence(controlevent_spawn_sequence, "control event: spawn", FALSE); r = MsiDoActionA(hpkg, "spawn2"); - todo_wine ok(r == ERROR_INSTALL_USEREXIT, "expected ERROR_INSTALL_USEREXIT, got %u\n", r); - ok_sequence(controlevent_spawn2_sequence, "control event: spawn2", TRUE); + ok_sequence(controlevent_spawn2_sequence, "control event: spawn2", FALSE); MsiCloseHandle(hpkg); ok_sequence(closehandle_sequence, "MsiCloseHandle()", FALSE);

1 0

Zebediah Figura : msi: Add support for ActionText table.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 52fbaeb2c44e585cacd7f0b57e902dfbcf54d09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fbaeb2c44e585cacd7f0b57… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 23 20:49:05 2017 -0500 msi: Add support for ActionText table. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 15 ++++++++++++++- dlls/msi/tests/package.c | 25 +++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b521925..64e01c4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -160,13 +160,26 @@ static const WCHAR szWriteEnvironmentStrings[] = static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template) { - MSIRECORD *row = MSI_CreateRecord(3); + WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','A','c','t','i','o','n','T','e','x','t','`',' ','W','H','E','R','E',' ', + '`','A','c','t','i','o','n','`',' ','=',' ','\'','%','s','\'',0}; + MSIRECORD *row, *textrow; INT rc; + + textrow = MSI_QueryGetRecord(package->db, query, action); + if (textrow) + { + description = MSI_RecordGetString(textrow, 2); + template = MSI_RecordGetString(textrow, 3); + } + + row = MSI_CreateRecord(3); if (!row) return -1; MSI_RecordSetStringW(row, 1, action); MSI_RecordSetStringW(row, 2, description); MSI_RecordSetStringW(row, 3, template); rc = MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, row); + if (textrow) msiobj_release(&textrow->hdr); msiobj_release(&row->hdr); return rc; } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c10488a..c00ed61 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -687,6 +687,16 @@ static UINT create_controlevent_table( MSIHANDLE hdb ) "PRIMARY KEY `Dialog_`, `Control_`, `Event`, `Argument`, `Condition`)"); } +static UINT create_actiontext_table( MSIHANDLE hdb ) +{ + return run_query(hdb, + "CREATE TABLE `ActionText` (" + "`Action` CHAR(72) NOT NULL, " + "`Description` CHAR(64) LOCALIZABLE, " + "`Template` CHAR(128) LOCALIZABLE " + "PRIMARY KEY `Action`)"); +} + #define make_add_entry(type, qtext) \ static UINT add##_##type##_##entry( MSIHANDLE hdb, const char *values ) \ { \ @@ -782,6 +792,10 @@ make_add_entry(controlevent, "INSERT INTO `ControlEvent` " "(`Dialog_`, `Control_`, `Event`, `Argument`, `Condition`, `Ordering`) VALUES( %s )"); +make_add_entry(actiontext, + "INSERT INTO `ActionText` " + "(`Action`, `Description`, `Template`) VALUES( %s )"); + static UINT add_reglocator_entry( MSIHANDLE hdb, const char *sig, UINT root, const char *path, const char *name, UINT type ) { @@ -9394,14 +9408,14 @@ static const struct externalui_message processmessage_error_format_sequence[] = }; static const struct externalui_message doaction_costinitialize_sequence[] = { - {INSTALLMESSAGE_ACTIONSTART, 3, {"", "CostInitialize", "", ""}, {0, 1, 0, 1}}, + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "CostInitialize", "cost description", "cost template"}, {0, 1, 1, 1}}, {INSTALLMESSAGE_INFO, 2, {"", "CostInitialize", ""}, {0, 1, 1}}, {INSTALLMESSAGE_INFO, 2, {"", "CostInitialize", "1"}, {0, 1, 1}}, {0} }; static const struct externalui_message doaction_custom_sequence[] = { - {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "description", "template"}, {0, 1, 1, 1}}, {INSTALLMESSAGE_INFO, 2, {"", "custom", "1"}, {0, 1, 1}}, {INSTALLMESSAGE_INFO, 2, {"", "custom", "0"}, {0, 1, 1}}, {0} @@ -9540,6 +9554,13 @@ static void test_externalui_message(void) r = run_query(hdb, "INSERT INTO `Error` (`Error`, `Message`) VALUES (5, 'internal error')"); ok(r == ERROR_SUCCESS, "Failed to insert into Error table: %u\n", r); + r = create_actiontext_table(hdb); + ok(r == ERROR_SUCCESS, "Failed to create ActionText table: %u\n", r); + r = add_actiontext_entry(hdb, "'custom', 'description', 'template'"); + ok(r == ERROR_SUCCESS, "Failed to insert into ActionText table: %u\n", r); + r = add_actiontext_entry(hdb, "'CostInitialize', 'cost description', 'cost template'"); + ok(r == ERROR_SUCCESS, "Failed to insert into ActionText table: %u\n", r); + r = MsiOpenPackageA(NULL, &hpkg); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); ok_sequence(empty_sequence, "MsiOpenPackage with NULL db", FALSE);

1 0

Hugh McMaster : comctl32/listview: Invalidate the focus rectangle when the control gets or loses focus.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 1d45250a58c485961741da285934c9a45d1e2ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d45250a58c485961741da285… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 7 12:29:10 2017 +0000 comctl32/listview: Invalidate the focus rectangle when the control gets or loses focus. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8506566..73eceff 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2221,9 +2221,8 @@ static void LISTVIEW_ShowFocusRect(const LISTVIEW_INFO *infoPtr, BOOL fShow) SelectObject(hdc, hOldFont); } else - { - LISTVIEW_DrawFocusRect(infoPtr, hdc); - } + LISTVIEW_InvalidateItem(infoPtr, infoPtr->nFocusedItem); + done: ReleaseDC(infoPtr->hwndSelf, hdc); }

1 0

Jacek Caban : wininet: Correctly pass URL length to InternetCrackUrlW in get_redirect_url.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 7949a22b43eb1c48a5e53e352ca854cb7800146e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7949a22b43eb1c48a5e53e352… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 7 14:20:19 2017 +0200 wininet: Correctly pass URL length to InternetCrackUrlW in get_redirect_url. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 078a5cb..3a8f2b8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3994,7 +3994,7 @@ static WCHAR *get_redirect_url(http_request_t *request) } urlComponents.dwSchemeLength = 1; - b = InternetCrackUrlW(redirect_url, url_length, 0, &urlComponents); + b = InternetCrackUrlW(redirect_url, url_length / sizeof(WCHAR), 0, &urlComponents); if(b && urlComponents.dwSchemeLength && urlComponents.nScheme != INTERNET_SCHEME_HTTP && urlComponents.nScheme != INTERNET_SCHEME_HTTPS) { TRACE("redirect to non-http URL\n");

1 0

Francois Gouget : msi/tests: Add a trailing linefeed to a couple of ok() calls.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 5e7b8891fc5d7b262d3fc21fb1bb59839c87ee8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7b8891fc5d7b262d3fc21fb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 22 12:21:46 2017 +0200 msi/tests: Add a trailing linefeed to a couple of ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d978286..eadef05 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9583,7 +9583,7 @@ static void test_externalui_message(void) ok(hdb, "failed to create database\n"); r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = create_dialog_table(hdb); ok(r == ERROR_SUCCESS, "failed to create dialog table %u\n", r); @@ -9593,7 +9593,7 @@ static void test_externalui_message(void) r = create_control_table(hdb); ok(r == ERROR_SUCCESS, "failed to create control table %u\n", r); r = add_control_entry(hdb, "'dialog', 'dummy', 'Text', 5, 5, 5, 5, 3, 'dummy'"); - ok(r == ERROR_SUCCESS, "failed to insert into control table %u", r); + ok(r == ERROR_SUCCESS, "failed to insert into control table %u\n", r); r = package_from_db(hdb, &hpkg); ok(r == ERROR_SUCCESS, "failed to create package %u\n", r);

1 0

Francois Gouget : msi: Add a trailing linefeed to a FIXME() trace.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: d631714ca86f28d9f8203083660aad01d93c4964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d631714ca86f28d9f82030836… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 22 12:21:55 2017 +0200 msi: Add a trailing linefeed to a FIXME() trace. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 4c44a84..60887d7 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1843,7 +1843,7 @@ static INT internal_ui_handler(MSIPACKAGE *package, INSTALLMESSAGE eMessageType, ; } default: - FIXME("internal UI not implemented for message 0x%08x (UI level = %x)", eMessageType, package->ui_level); + FIXME("internal UI not implemented for message 0x%08x (UI level = %x)\n", eMessageType, package->ui_level); return 0; } }

1 0

Nikolay Sivov : msi: Avoid uninitialized pointer access on error path ( Coverity).
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 3ca2dfe4624e2d4194c10b01b4c10f09a1cdc0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca2dfe4624e2d4194c10b01b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 24 17:35:22 2017 +0300 msi: Avoid uninitialized pointer access on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 4297fbc..108b28d 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -840,7 +840,7 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, LPDWORD size ) { - WCHAR *format, *deformated; + WCHAR *format, *deformated = NULL; UINT rc = ERROR_INVALID_PARAMETER; DWORD len; MSIRECORD *record_deformated;

1 0

Nikolay Sivov : winhttp: Avoid returning while holding a lock (Coverity).
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: d0813b77181be37cc4e18d1cba4a285513e417a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0813b77181be37cc4e18d1cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 24 15:41:01 2017 +0300 winhttp: Avoid returning while holding a lock (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f71b17e..b72d2c1 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1121,19 +1121,21 @@ static BOOL open_connection( request_t *request ) if (!host) { - if (!(host = heap_alloc( sizeof(*host) ))) return FALSE; - host->ref = 1; - host->secure = is_secure; - host->port = port; - list_init( &host->connections ); - if ((host->hostname = strdupW( connect->servername ))) + if ((host = heap_alloc( sizeof(*host) ))) { - list_add_head( &connection_pool, &host->entry ); - } - else - { - heap_free( host ); - host = NULL; + host->ref = 1; + host->secure = is_secure; + host->port = port; + list_init( &host->connections ); + if ((host->hostname = strdupW( connect->servername ))) + { + list_add_head( &connection_pool, &host->entry ); + } + else + { + heap_free( host ); + host = NULL; + } } }

1 0

Zebediah Figura : msi: Use MsiProcessMessage() to send error messages.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 77e3d3372fd361bb58d68325fd3739e1683b3237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e3d3372fd361bb58d68325f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 23 15:50:53 2017 -0500 msi: Use MsiProcessMessage() to send error messages. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 51 ++------- dlls/msi/dialog.c | 112 -------------------- dlls/msi/media.c | 41 ++------ dlls/msi/msi.rc | 12 +-- dlls/msi/msipriv.h | 2 - dlls/msi/package.c | 112 ++++++++++++++++---- dlls/msi/resource.h | 23 ++-- dlls/msi/tests/package.c | 41 ++++++++ po/ar.po | 262 +++++++++++++++++++++++---------------------- po/bg.po | 258 +++++++++++++++++++++++---------------------- po/ca.po | 262 +++++++++++++++++++++++---------------------- po/cs.po | 262 +++++++++++++++++++++++---------------------- po/da.po | 262 +++++++++++++++++++++++---------------------- po/de.po | 264 ++++++++++++++++++++++++---------------------- po/el.po | 258 +++++++++++++++++++++++---------------------- po/en.po | 266 ++++++++++++++++++++++++---------------------- po/en_US.po | 266 ++++++++++++++++++++++++---------------------- po/eo.po | 258 +++++++++++++++++++++++---------------------- po/es.po | 262 +++++++++++++++++++++++---------------------- po/fa.po | 258 +++++++++++++++++++++++---------------------- po/fi.po | 264 ++++++++++++++++++++++++---------------------- po/fr.po | 262 +++++++++++++++++++++++---------------------- po/he.po | 258 +++++++++++++++++++++++---------------------- po/hi.po | 258 +++++++++++++++++++++++---------------------- po/hr.po | 262 +++++++++++++++++++++++---------------------- po/hu.po | 262 +++++++++++++++++++++++---------------------- po/it.po | 262 +++++++++++++++++++++++---------------------- po/ja.po | 268 ++++++++++++++++++++++++----------------------- po/ko.po | 262 +++++++++++++++++++++++---------------------- po/lt.po | 262 +++++++++++++++++++++++---------------------- po/ml.po | 258 +++++++++++++++++++++++---------------------- po/nb_NO.po | 258 +++++++++++++++++++++++---------------------- po/nl.po | 262 +++++++++++++++++++++++---------------------- po/or.po | 258 +++++++++++++++++++++++---------------------- po/pa.po | 258 +++++++++++++++++++++++---------------------- po/pl.po | 266 ++++++++++++++++++++++++---------------------- po/pt_BR.po | 262 +++++++++++++++++++++++---------------------- po/pt_PT.po | 262 +++++++++++++++++++++++---------------------- po/rm.po | 258 +++++++++++++++++++++++---------------------- po/ro.po | 262 +++++++++++++++++++++++---------------------- po/ru.po | 262 +++++++++++++++++++++++---------------------- po/sk.po | 258 +++++++++++++++++++++++---------------------- po/sl.po | 262 +++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 258 +++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 258 +++++++++++++++++++++++---------------------- po/sv.po | 262 +++++++++++++++++++++++---------------------- po/te.po | 258 +++++++++++++++++++++++---------------------- po/th.po | 258 +++++++++++++++++++++++---------------------- po/tr.po | 264 ++++++++++++++++++++++++---------------------- po/uk.po | 266 ++++++++++++++++++++++++---------------------- po/wa.po | 258 +++++++++++++++++++++++---------------------- po/wine.pot | 258 +++++++++++++++++++++++---------------------- po/zh_CN.po | 262 +++++++++++++++++++++++---------------------- po/zh_TW.po | 262 +++++++++++++++++++++++---------------------- 54 files changed, 6409 insertions(+), 5993 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77e3d3372fd361bb58d68…

1 0