March 2020 - Wine-Commits - list.winehq.org

Ziqing Hui : comctl32/imagelist: Correctly handle alpha channel of 32bpp image.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 61b9209221d28d5d02379791ac1316c1fc2ca3b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61b9209221d28d5d02379791… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Mar 2 10:31:05 2020 +0800 comctl32/imagelist: Correctly handle alpha channel of 32bpp image. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 24 ++++++++++-------------- dlls/comctl32/tests/imagelist.c | 2 -- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 9a6ea3bbff..3cf7cc8c7f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -215,16 +215,7 @@ static void add_dib_bits( HIMAGELIST himl, int pos, int count, int width, int he for (j = n * width; j < (n + 1) * width; j++) if ((has_alpha = ((bits[i * stride + j] & 0xff000000) != 0))) break; - if (!has_alpha) /* generate alpha channel from the mask */ - { - for (i = 0; i < height; i++) - for (j = n * width; j < (n + 1) * width; j++) - if (!mask_info || !((mask_bits[i * mask_stride + j / 8] << (j % 8)) & 0x80)) - bits[i * stride + j] |= 0xff000000; - else - bits[i * stride + j] = 0; - } - else + if (has_alpha) { himl->has_alpha[pos + n] = 1; @@ -1251,7 +1242,7 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, int src_x, int src_y, int cx, int cy, BLENDFUNCTION func, - UINT style, COLORREF blend_col ) + UINT style, COLORREF blend_col, BOOL has_alpha ) { BOOL ret = FALSE; HDC hdc; @@ -1302,7 +1293,7 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des } } - if (himl->has_alpha) /* we already have an alpha channel in this case */ + if (has_alpha) /* we already have an alpha channel in this case */ { /* pre-multiply by the alpha channel */ for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) @@ -1338,6 +1329,11 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des if ((((BYTE *)mask_bits)[i * width_bytes + j / 8] << (j % 8)) & 0x80) *ptr = 0; else *ptr |= 0xff000000; } + else + { + for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) + *ptr |= 0xff000000; + } ret = GdiAlphaBlend( dest_dc, dest_x, dest_y, cx, cy, hdc, 0, 0, cx, cy, func ); @@ -1446,7 +1442,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (bIsTransparent) { bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, - pt.x, pt.y, cx, cy, func, fStyle, blend_col ); + pt.x, pt.y, cx, cy, func, fStyle, blend_col, has_alpha ); goto end; } colour = pimldp->rgbBk; @@ -1455,7 +1451,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col, has_alpha ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 9271354edb..aa563574ed 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2316,8 +2316,6 @@ static void test_alpha(void) DeleteObject(hbm_test); get_image_alpha(himl, i / 2, 2, 1, alpha); - - todo_wine_if(i == 0) ok(alpha[0] == GetAValue(test_bitmaps[i]) && alpha[1] == GetAValue(test_bitmaps[i + 1]), "Bitmap [%08X, %08X] returned alpha value [%02X, %02X], expected [%02X, %02X]\n", test_bitmaps[i], test_bitmaps[i + 1], alpha[0], alpha[1],

1 0

Dmitry Timoshkov : msi: Add support for ListView dialog control.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 76606eaea034c51a73190aac92e75d8b20e82164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76606eaea034c51a73190aac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 19:04:28 2020 +0800 msi: Add support for ListView dialog control. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 8a28e4d4af..67a0633991 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -66,6 +66,7 @@ struct msi_control_tag LPWSTR value; HBITMAP hBitmap; HICON hIcon; + HIMAGELIST hImageList; LPWSTR tabnext; LPWSTR type; HMODULE hDll; @@ -159,6 +160,7 @@ static const WCHAR szVolumeSelectCombo[] = { 'V','o','l','u','m','e','S','e','l' static const WCHAR szSelectionDescription[] = {'S','e','l','e','c','t','i','o','n','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; static const WCHAR szHyperLink[] = {'H','y','p','e','r','L','i','n','k',0}; +static const WCHAR szListView[] = {'L','i','s','t','V','i','e','w',0}; /* dialog sequencing */ @@ -401,6 +403,8 @@ static void msi_destroy_control( msi_control *t ) DeleteObject( t->hBitmap ); if( t->hIcon ) DestroyIcon( t->hIcon ); + if ( t->hImageList ) + ImageList_Destroy( t->hImageList ); msi_free( t->tabnext ); msi_free( t->type ); if (t->hDll) @@ -431,6 +435,7 @@ static msi_control *dialog_create_window( msi_dialog *dialog, MSIRECORD *rec, DW control->value = NULL; control->hBitmap = NULL; control->hIcon = NULL; + control->hImageList = NULL; control->hDll = NULL; control->tabnext = strdupW( MSI_RecordGetString( rec, 11) ); control->type = strdupW( MSI_RecordGetString( rec, 3 ) ); @@ -3522,6 +3527,107 @@ static UINT msi_dialog_hyperlink( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } +/******************** ListView *****************************************/ + +struct listview_param +{ + msi_dialog *dialog; + msi_control *control; +}; + +static UINT msi_dialog_listview_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +{ + NMHDR *nmhdr = (NMHDR *)param; + + FIXME("code %#x (%d)\n", nmhdr->code, nmhdr->code); + + return ERROR_SUCCESS; +} + +static UINT msi_listview_add_item( MSIRECORD *rec, LPVOID param ) +{ + struct listview_param *lv_param = (struct listview_param *)param; + LPCWSTR text, binary; + LVITEMW item; + HICON hIcon; + + text = MSI_RecordGetString( rec, 4 ); + binary = MSI_RecordGetString( rec, 5 ); + hIcon = msi_load_icon( lv_param->dialog->package->db, binary, 0 ); + + TRACE("Adding: text %s, binary %s, icon %p\n", debugstr_w(text), debugstr_w(binary), hIcon); + + memset( &item, 0, sizeof(item) ); + item.mask = LVIF_TEXT | LVIF_IMAGE; + deformat_string( lv_param->dialog->package, text, &item.pszText ); + item.iImage = ImageList_AddIcon( lv_param->control->hImageList, hIcon ); + item.iItem = item.iImage; + SendMessageW( lv_param->control->hwnd, LVM_INSERTITEMW, 0, (LPARAM)&item ); + + DestroyIcon( hIcon ); + + return ERROR_SUCCESS; +} + +static UINT msi_listview_add_items( msi_dialog *dialog, msi_control *control ) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','L','i','s','t','V','i','e','w','`',' ','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}; + MSIQUERY *view; + struct listview_param lv_param = { dialog, control }; + + if (MSI_OpenQuery( dialog->package->db, &view, query, control->property ) == ERROR_SUCCESS) + { + MSI_IterateRecords( view, NULL, msi_listview_add_item, &lv_param ); + msiobj_release( &view->hdr ); + } + + return ERROR_SUCCESS; +} + +static UINT msi_dialog_listview( msi_dialog *dialog, MSIRECORD *rec ) +{ + msi_control *control; + LPCWSTR prop; + DWORD style, attributes; + LVCOLUMNW col; + RECT rc; + + style = LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SINGLESEL | + LVS_SHOWSELALWAYS | WS_VSCROLL | WS_HSCROLL | WS_BORDER | WS_TABSTOP | WS_CHILD; + attributes = MSI_RecordGetInteger( rec, 8 ); + if ( ~attributes & msidbControlAttributesSorted ) + style |= LVS_SORTASCENDING; + control = msi_dialog_add_control( dialog, rec, WC_LISTVIEWW, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + + prop = MSI_RecordGetString( rec, 9 ); + control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + + control->hImageList = ImageList_Create( 16, 16, ILC_COLOR32, 0, 1); + SendMessageW( control->hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)control->hImageList ); + + col.mask = LVCF_FMT | LVCF_WIDTH; + col.fmt = LVCFMT_LEFT; + col.cx = 16; + SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, 0, (LPARAM)&col ); + + GetClientRect( control->hwnd, &rc ); + col.cx = rc.right - 16; + SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, 0, (LPARAM)&col ); + + if (control->property) + msi_listview_add_items( dialog, control ); + + control->handler = msi_dialog_listview_handler; + + return ERROR_SUCCESS; +} + static const struct control_handler msi_dialog_handler[] = { { szText, msi_dialog_text_control }, @@ -3544,7 +3650,8 @@ static const struct control_handler msi_dialog_handler[] = { szDirectoryList, msi_dialog_directory_list }, { szVolumeCostList, msi_dialog_volumecost_list }, { szVolumeSelectCombo, msi_dialog_volumeselect_combo }, - { szHyperLink, msi_dialog_hyperlink } + { szHyperLink, msi_dialog_hyperlink }, + { szListView, msi_dialog_listview } }; static UINT msi_dialog_create_controls( MSIRECORD *rec, LPVOID param )

1 0

Alexandre Julliard : kernel32: Remove the nameprep tables.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 5d2ec076fed7912f5e4cee6edf71953f3cfbc391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d2ec076fed7912f5e4cee6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 18:29:47 2020 +0100 kernel32: Remove the nameprep tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/locale.c | 3 - dlls/kernel32/nameprep.c | 1299 --------------------------------------------- tools/make_unicode | 218 -------- 4 files changed, 1521 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d2ec076fed7912f5e4c…

1 0

Michael Müller : server: Hold a reference to the file in delete_file().
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 504cf18e19535759e75ce81db0909ba3136c9bfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=504cf18e19535759e75ce81d… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 14 12:10:21 2020 -0600 server: Hold a reference to the file in delete_file(). Otherwise, we may attempt to access freed memory trawling the device list. This can occur if a device driver crashes during an IRP_CALL_CLOSE request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/device.c b/server/device.c index b02d965e33..01e08f295f 100644 --- a/server/device.c +++ b/server/device.c @@ -729,12 +729,17 @@ static void delete_file( struct device_file *file ) { struct irp_call *irp, *next; + /* the pending requests may be the only thing holding a reference to the file */ + grab_object( file ); + /* terminate all pending requests */ LIST_FOR_EACH_ENTRY_SAFE( irp, next, &file->requests, struct irp_call, dev_entry ) { list_remove( &irp->mgr_entry ); set_irp_result( irp, STATUS_FILE_DELETED, NULL, 0, 0 ); } + + release_object( file ); } static void delete_device( struct device *device )

1 0

Zebediah Figura : http.sys: Handle the "+" URL wildcard.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 131801fc70e004e2b20e61ba7144080c663a9074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=131801fc70e004e2b20e61ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 2 21:35:01 2020 -0600 http.sys: Handle the "+" URL wildcard. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48530 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 6 ++++++ dlls/httpapi/tests/httpapi.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 25c8a1955a..f424a4fecc 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -802,6 +802,12 @@ static BOOL host_matches(const struct connection *conn, const struct request_que { const char *conn_host = (conn->url[0] == '/') ? conn->host : conn->url + 7; + if (queue->url[7] == '+') + { + const char *queue_port = strchr(queue->url + 7, ':'); + return !strncmp(queue_port, strchr(conn_host, ':'), strlen(queue_port) - 1 /* strip final slash */); + } + return !memicmp(queue->url + 7, conn_host, strlen(queue->url) - 8 /* strip final slash */); } diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 5a9f3c3178..fa39742cb1 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -1086,6 +1086,56 @@ static void test_v1_unknown_tokens(void) ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); } +static void test_v1_urls(void) +{ + char DECLSPEC_ALIGN(8) req_buffer[2048]; + HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer; + unsigned short port; + char req_text[200]; + DWORD ret_size; + WCHAR url[50]; + HANDLE queue; + ULONG ret; + SOCKET s; + + ret = HttpCreateHttpHandle(&queue, 0); + ok(!ret, "Got error %u.\n", ret); + + for (port = 50000; port < 51000; ++port) + { + swprintf(url, ARRAY_SIZE(url), L"http://+:%u/", port); + if (!(ret = HttpAddUrl(queue, url, NULL))) + break; + if (ret == ERROR_ACCESS_DENIED) + { + skip("Not enough permissions to bind to all URLs.\n"); + CloseHandle(queue); + return; + } + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); + } + + ok(!ret, "Got error %u.\n", ret); + + s = create_client_socket(port); + sprintf(req_text, simple_req, port); + ret = send(s, req_text, strlen(req_text), 0); + ok(ret == strlen(req_text), "send() returned %d.\n", ret); + + memset(req_buffer, 0xcc, sizeof(req_buffer)); + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), &ret_size, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); + + send_response_v1(queue, req->RequestId, s); + + ret = HttpRemoveUrl(queue, url); + ok(!ret, "Got error %u.\n", ret); + closesocket(s); + ret = CloseHandle(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); +} + static void test_HttpCreateServerSession(void) { HTTP_SERVER_SESSION_ID session; @@ -1478,6 +1528,7 @@ START_TEST(httpapi) test_v1_bad_request(); test_v1_cooked_url(); test_v1_unknown_tokens(); + test_v1_urls(); ret = HttpTerminate(HTTP_INITIALIZE_SERVER, NULL); ok(!ret, "Failed to terminate, ret %u.\n", ret);

1 0

Zebediah Figura : server: Make free_object() static.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 2b9c7f8bfb49c953a12b73c99d21b892d6d339e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b9c7f8bfb49c953a12b73c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 14 12:10:19 2020 -0600 server: Make free_object() static. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/object.c b/server/object.c index 048da504ad..aeb30684a8 100644 --- a/server/object.c +++ b/server/object.c @@ -215,7 +215,7 @@ void *alloc_object( const struct object_ops *ops ) } /* free an object once it has been destroyed */ -void free_object( struct object *obj ) +static void free_object( struct object *obj ) { free( obj->sd ); #ifdef DEBUG_OBJECTS

1 0

Alexandre Julliard : ntdll: Reimplement IdnToNameprepUnicode() using the NLS normalization table.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: cd13557f488e28845dbb78b947b0fa47f7036f53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd13557f488e28845dbb78b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 16:28:17 2020 +0100 ntdll: Reimplement IdnToNameprepUnicode() using the NLS normalization table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 210 +------------------------------------------ dlls/kernel32/tests/locale.c | 16 ++-- dlls/ntdll/locale.c | 74 +++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 5 files changed, 90 insertions(+), 212 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cd13557f488e28845dbb…

1 0

Alexandre Julliard : ntdll: Delay NFC table loading on macOS.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 35c223850e1bc9e8f97bfaf403bfabca69db3447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35c223850e1bc9e8f97bfaf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 09:06:21 2020 +0100 ntdll: Delay NFC table loading on macOS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48689 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 8a2b233f88..5602c18df5 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -799,13 +799,7 @@ void init_unix_codepage(void) #else /* __APPLE__ || __ANDROID__ */ -void init_unix_codepage(void) -{ -#ifdef __APPLE__ - const struct norm_table *info; - load_norm_table( NormalizationC, &info ); -#endif -} +void init_unix_codepage(void) { } #endif /* __APPLE__ || __ANDROID__ */ @@ -909,6 +903,10 @@ void init_locale( HMODULE module ) user_lcid = unix_locale_to_lcid( setlocale( LC_MESSAGES, NULL )); #ifdef __APPLE__ + { + const struct norm_table *info; + load_norm_table( NormalizationC, &info ); + } if (!system_lcid) { char buffer[LOCALE_NAME_MAX_LENGTH];

1 0

Zebediah Figura : http.sys: Translate WSAEACCES to STATUS_ACCESS_DENIED.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 4cae0e6bc2c3a1dd1a8c2fd446d0ae1034ffa091 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cae0e6bc2c3a1dd1a8c2fd4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 2 21:35:00 2020 -0600 http.sys: Translate WSAEACCES to STATUS_ACCESS_DENIED. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 5fbae66b75..25c8a1955a 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1112,6 +1112,11 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) WARN("Address %s is already in use.\n", debugstr_a(params->url)); return STATUS_SHARING_VIOLATION; } + else if (WSAGetLastError() == WSAEACCES) + { + WARN("Not enough permissions to bind to address %s.\n", debugstr_a(params->url)); + return STATUS_ACCESS_DENIED; + } ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); return STATUS_UNSUCCESSFUL; }

1 0

Zebediah Figura : http.sys: Support cancelling IRPs.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: fb35743f843dea8ae47cfdeee04894465ab71c47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb35743f843dea8ae47cfdee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 2 21:34:58 2020 -0600 http.sys: Support cancelling IRPs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 28 ++++++++++++++++++++++++++-- dlls/httpapi/tests/httpapi.c | 12 ++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 4259ca618f..9587eaa9a8 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1178,6 +1178,20 @@ static struct connection *get_connection(HTTP_REQUEST_ID req_id) return NULL; } +static void WINAPI http_receive_request_cancel(DEVICE_OBJECT *device, IRP *irp) +{ + TRACE("device %p, irp %p.\n", device, irp); + + IoReleaseCancelSpinLock(irp->CancelIrql); + + EnterCriticalSection(&http_cs); + RemoveEntryList(&irp->Tail.Overlay.ListEntry); + LeaveCriticalSection(&http_cs); + + irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) { const struct http_receive_request_params *params = irp->AssociatedIrp.SystemBuffer; @@ -1199,8 +1213,18 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) if (params->id == HTTP_NULL_ID) { TRACE("Queuing IRP %p.\n", irp); - InsertTailList(&queue->irp_queue, &irp->Tail.Overlay.ListEntry); - ret = STATUS_PENDING; + + IoSetCancelRoutine(irp, http_receive_request_cancel); + if (irp->Cancel && !IoSetCancelRoutine(irp, NULL)) + { + /* The IRP was canceled before we set the cancel routine. */ + ret = STATUS_CANCELLED; + } + else + { + InsertTailList(&queue->irp_queue, &irp->Tail.Overlay.ListEntry); + ret = STATUS_PENDING; + } } else ret = STATUS_CONNECTION_INVALID; diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index fced1b5e2f..5a9f3c3178 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -348,6 +348,18 @@ static void test_v1_server(void) ret = remove_url_v1(queue, port); ok(ret == ERROR_FILE_NOT_FOUND, "Got error %u.\n", ret); + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); + ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + + ret = CancelIo(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + + ret_size = 0xdeadbeef; + ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Got error %u.\n", GetLastError()); + ok(!ret_size, "Got size %u.\n", ret_size); + closesocket(s); CloseHandle(ovl.hEvent); ret = CloseHandle(queue);

1 0