June 2021 - Wine-commits - list.winehq.org

Zhiyi Zhang : gdi32: Return correct color depth for display DCs in GetDeviceCaps().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: d171d1116764260f4ae272c69b54e5dfd13c6835 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d171d1116764260f4ae272c6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 31 16:12:44 2021 +0800 gdi32: Return correct color depth for display DCs in GetDeviceCaps(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29184 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 19 ++++++++++++++++++- dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/init.c | 2 -- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a2ebd018bca..2042701dd45 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -460,7 +460,24 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; } - case BITSPIXEL: return 32; + case BITSPIXEL: + { + DEVMODEW devmode; + WCHAR *display; + DC *dc; + + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pEnumDisplaySettingsW) + { + dc = get_nulldrv_dc( dev ); + display = dc->display[0] ? dc->display : NULL; + memset( &devmode, 0, sizeof(devmode) ); + devmode.dmSize = sizeof(devmode); + if (pEnumDisplaySettingsW( display, ENUM_CURRENT_SETTINGS, &devmode ) + && devmode.dmFields & DM_BITSPERPEL && devmode.dmBitsPerPel) + return devmode.dmBitsPerPel; + } + return 32; + } case PLANES: return 1; case NUMBRUSHES: return -1; case NUMPENS: return -1; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ab03837f5e6..654f77ed617 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2068,7 +2068,6 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ dm->dmDisplayFrequency, value); value = GetDeviceCaps(hdc, BITSPIXEL); - todo_wine_if(dm->dmBitsPerPel != 32) ok_(__FILE__, line)(value == dm->dmBitsPerPel, "Expected BITSPIXEL %d, got %d.\n", dm->dmBitsPerPel, value); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d070c0f1171..ff3d5317697 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -162,8 +162,6 @@ static INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { - case BITSPIXEL: - return screen_bpp; case SIZEPALETTE: return palette_size; default:

1 0

Zhiyi Zhang : gdi32: Implement MFDRV_SetLayout().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 683fdec3a8a1d796c1f0a282facdf41267d21e11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=683fdec3a8a1d796c1f0a282… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 31 16:12:56 2021 +0800 gdi32: Implement MFDRV_SetLayout(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/mfdrv/dc.c | 5 +++ dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 + dlls/gdi32/tests/metafile.c | 79 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 61417bfd462..a036efe2d17 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -85,6 +85,11 @@ INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) return MFDRV_MetaParam2( dev, META_OFFSETCLIPRGN, x, y ); } +DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) +{ + return MFDRV_MetaParam2( dev, META_SETLAYOUT, HIWORD(layout), LOWORD(layout) ); +} + INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) { return MFDRV_MetaParam1( dev, META_SETMAPMODE, mode ); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 2a215b70902..fe7aae631d7 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -201,7 +201,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ - NULL, /* pSetLayout */ + MFDRV_SetLayout, /* pSetLayout */ MFDRV_SetMapMode, /* pSetMapMode */ MFDRV_SetMapperFlags, /* pSetMapperFlags */ MFDRV_SetPixel, /* pSetPixel */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 7d3d1c41da5..429b95b3f40 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -113,6 +113,7 @@ extern COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_H extern INT CDECL MFDRV_SetBkMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ab823dd443d..83a10264589 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -5072,6 +5072,84 @@ static void test_emf_text_extents(void) ReleaseDC(0, dc); } +static const unsigned char MF_SETLAYOUT_BITS[] = +{ +/* Winedump output. Note that there is no META_SELECTOBJECT records after META_SETLAYOUT. + * + * METAHEADER 00000012 + * type 1 header_size 0x12 version 0x300 size 0x54 object_count 0 max_record_size 0xa parameter_count 0 + * 0001 0009 0300 002a 0000 0000 0005 0000 + * 0000 + * META_SETLAYOUT 0000000a + * 0000 0000 + * META_SETLAYOUT 0000000a + * 0001 0000 + * META_SETLAYOUT 0000000a + * 0008 0000 + * META_SETLAYOUT 0000000a + * 0000 8000 + * META_SETLAYOUT 0000000a + * 0009 0000 + * META_SETLAYOUT 0000000a + * 0001 8000 + * META_EOF 00000006 + */ + 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x2a, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x49, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x49, 0x01, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x49, 0x01, 0x08, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x49, 0x01, 0x00, 0x00, + 0x00, 0x80, 0x05, 0x00, 0x00, 0x00, 0x49, 0x01, + 0x09, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x49, 0x01, 0x01, 0x00, 0x00, 0x80, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00 +}; + +static void test_mf_SetLayout(void) +{ + static const DWORD tests[] = + { + LAYOUT_LTR, + LAYOUT_RTL, + LAYOUT_BITMAPORIENTATIONPRESERVED, + NOMIRRORBITMAP, + LAYOUT_RTL | LAYOUT_BITMAPORIENTATIONPRESERVED, + LAYOUT_RTL | NOMIRRORBITMAP, + }; + DWORD layout; + HMETAFILE mf; + int ret, i; + HDC mf_dc; + + mf_dc = CreateMetaFileW(NULL); + ok(!!mf_dc, "CreateMetaFileW failed, error %d\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("Test %d", i); + layout = SetLayout(mf_dc, tests[i]); + ok(layout == LAYOUT_RTL, "Expected %#x, got %#x\n", tests[i], layout); + layout = GetLayout(mf_dc); + todo_wine ok(layout == GDI_ERROR, "Expected %#x, got %#x\n", GDI_ERROR, layout); + winetest_pop_context(); + } + + mf = CloseMetaFile(mf_dc); + ok(!!mf, "CloseMetaFile failed, error %d\n", GetLastError()); + + ret = compare_mf_bits(mf, MF_SETLAYOUT_BITS, sizeof(MF_SETLAYOUT_BITS), "mf_SetLayout"); + ok(!ret, "Bits mismatch\n"); + if (ret) + { + dump_mf_bits(mf, "mf_SetLayout"); + EnumMetaFile(0, mf, mf_enum_proc, 0); + } + + DeleteMetaFile(mf); +} + START_TEST(metafile) { init_function_pointers(); @@ -5103,6 +5181,7 @@ START_TEST(metafile) test_mf_ExtTextOut_on_path(); test_mf_clipping(); test_mf_GetPath(); + test_mf_SetLayout(); /* For metafile conversions */ test_mf_conversions();

1 0

Zhiyi Zhang : gdi32: Use a common helper for emf StretchBlt and AlphaBlend.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: dadc6fd29b8bfeb94e9f3954a6d65473ab1d2ba6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dadc6fd29b8bfeb94e9f3954… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 31 16:13:06 2021 +0800 gdi32: Use a common helper for emf StretchBlt and AlphaBlend. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/bitblt.c | 129 ++++++++----------------------------------- 1 file changed, 23 insertions(+), 106 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 597a6110abd..f15acaa1f14 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -27,15 +27,17 @@ #include "enhmetafiledrv.h" #include "wine/debug.h" -BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, - PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) +/* Generate an EMRBITBLT, EMRSTRETCHBLT or EMRALPHABLEND record depending on the type parameter */ +static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSDEV dev_src, + struct bitblt_coords *src, DWORD rop, DWORD type ) { unsigned char src_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; UINT bits_size, bmi_size, emr_size, size, bpp; + EMRSTRETCHBLT *emr_stretchblt; struct gdi_image_bits bits; - EMRALPHABLEND *emr; BITMAPINFO *bmi; + EMRBITBLT *emr; DC *dc_src; DWORD err; BOOL ret = FALSE; @@ -56,14 +58,15 @@ BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, bmi_size = sizeof(BITMAPINFOHEADER) + 3 * sizeof(RGBQUAD); else bmi_size = sizeof(BITMAPINFOHEADER); - emr_size = sizeof(EMRALPHABLEND); + /* EMRSTRETCHBLT and EMRALPHABLEND have the same structure */ + emr_size = type == EMR_BITBLT ? sizeof(EMRBITBLT) : sizeof(EMRSTRETCHBLT); bits_size = src_info->bmiHeader.biSizeImage; size = emr_size + bmi_size + bits_size; emr = HeapAlloc(GetProcessHeap(), 0, size); if (!emr) goto err; - emr->emr.iType = EMR_ALPHABLEND; + emr->emr.iType = type; emr->emr.nSize = size; emr->rclBounds.left = dst->log_x; emr->rclBounds.top = dst->log_y; @@ -75,9 +78,13 @@ BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, emr->cyDest = dst->log_height; emr->xSrc = src->log_x; emr->ySrc = src->log_y; - emr->cxSrc = src->log_width; - emr->cySrc = src->log_height; - emr->dwRop = *(DWORD *)&func; + if (type == EMR_STRETCHBLT || type == EMR_ALPHABLEND) + { + emr_stretchblt = (EMRSTRETCHBLT *)emr; + emr_stretchblt->cxSrc = src->log_width; + emr_stretchblt->cySrc = src->log_height; + } + emr->dwRop = rop; GetTransform(dev_src->hdc, 0x204, &emr->xformSrc); emr->crBkColorSrc = GetBkColor(dev_src->hdc); emr->iUsageSrc = DIB_RGB_COLORS; @@ -115,6 +122,12 @@ err: return ret; } +BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, + PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) +{ + return emfdrv_stretchblt(dev_dst, dst, dev_src, src, *(DWORD *)&func, EMR_ALPHABLEND); +} + BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { EMRBITBLT emr; @@ -155,106 +168,10 @@ BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) BOOL CDECL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) { - BOOL ret; - PEMRBITBLT pEMR; - UINT emrSize; - UINT bmiSize; - UINT bitsSize; - UINT size; - BITMAP BM; - WORD nBPP = 0; - LPBITMAPINFOHEADER lpBmiH; - HBITMAP hBitmap = NULL; - DWORD emrType; - - if (devSrc->funcs == devDst->funcs) return FALSE; /* can't use a metafile DC as source */ - if (src->log_width == dst->log_width && src->log_height == dst->log_height) - { - emrType = EMR_BITBLT; - emrSize = sizeof(EMRBITBLT); - } - else - { - emrType = EMR_STRETCHBLT; - emrSize = sizeof(EMRSTRETCHBLT); - } - - hBitmap = GetCurrentObject(devSrc->hdc, OBJ_BITMAP); - - if(sizeof(BITMAP) != GetObjectW(hBitmap, sizeof(BITMAP), &BM)) - return FALSE; - - nBPP = BM.bmPlanes * BM.bmBitsPixel; - if(nBPP > 8) nBPP = 24; /* FIXME Can't get 16bpp to work for some reason */ - bitsSize = get_dib_stride( BM.bmWidth, nBPP ) * BM.bmHeight; - bmiSize = sizeof(BITMAPINFOHEADER) + - (nBPP <= 8 ? 1 << nBPP : 0) * sizeof(RGBQUAD); - - size = emrSize + bmiSize + bitsSize; - - pEMR = HeapAlloc(GetProcessHeap(), 0, size); - if (!pEMR) return FALSE; - - /* Initialize EMR */ - pEMR->emr.iType = emrType; - pEMR->emr.nSize = size; - pEMR->rclBounds.left = dst->log_x; - pEMR->rclBounds.top = dst->log_y; - pEMR->rclBounds.right = dst->log_x + dst->log_width - 1; - pEMR->rclBounds.bottom = dst->log_y + dst->log_height - 1; - pEMR->xDest = dst->log_x; - pEMR->yDest = dst->log_y; - pEMR->cxDest = dst->log_width; - pEMR->cyDest = dst->log_height; - pEMR->dwRop = rop; - pEMR->xSrc = src->log_x; - pEMR->ySrc = src->log_y; - GetTransform(devSrc->hdc, 0x204, &pEMR->xformSrc); - pEMR->crBkColorSrc = GetBkColor(devSrc->hdc); - pEMR->iUsageSrc = DIB_RGB_COLORS; - pEMR->offBmiSrc = emrSize; - pEMR->offBitsSrc = emrSize + bmiSize; - pEMR->cbBmiSrc = bmiSize; - pEMR->cbBitsSrc = bitsSize; - if (emrType == EMR_STRETCHBLT) - { - PEMRSTRETCHBLT pEMRStretch = (PEMRSTRETCHBLT)pEMR; - pEMRStretch->cxSrc = src->log_width; - pEMRStretch->cySrc = src->log_height; - } - - /* Initialize BITMAPINFO structure */ - lpBmiH = (LPBITMAPINFOHEADER)((BYTE*)pEMR + pEMR->offBmiSrc); - - lpBmiH->biSize = sizeof(BITMAPINFOHEADER); - lpBmiH->biWidth = BM.bmWidth; - lpBmiH->biHeight = BM.bmHeight; - lpBmiH->biPlanes = BM.bmPlanes; - lpBmiH->biBitCount = nBPP; - /* Assume the bitmap isn't compressed and set the BI_RGB flag. */ - lpBmiH->biCompression = BI_RGB; - lpBmiH->biSizeImage = bitsSize; - lpBmiH->biYPelsPerMeter = 0; - lpBmiH->biXPelsPerMeter = 0; - lpBmiH->biClrUsed = nBPP <= 8 ? 1 << nBPP : 0; - /* Set biClrImportant to 0, indicating that all of the - device colors are important. */ - lpBmiH->biClrImportant = 0; - - /* Initialize bitmap bits */ - if (GetDIBits(devSrc->hdc, hBitmap, 0, (UINT)lpBmiH->biHeight, - (BYTE*)pEMR + pEMR->offBitsSrc, - (LPBITMAPINFO)lpBmiH, DIB_RGB_COLORS)) - { - ret = EMFDRV_WriteRecord(devDst, (EMR*)pEMR); - if (ret) EMFDRV_UpdateBBox(devDst, &(pEMR->rclBounds)); - } + return emfdrv_stretchblt(devDst, dst, devSrc, src, rop, EMR_BITBLT); else - ret = FALSE; - - HeapFree( GetProcessHeap(), 0, pEMR); - return ret; + return emfdrv_stretchblt(devDst, dst, devSrc, src, rop, EMR_STRETCHBLT); } INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst,

1 0

Zhiyi Zhang : gdi32: Add more emf StretchBlt tests.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: b6820ad68df159a3fc0638b2e3388b460ed28d5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6820ad68df159a3fc0638b2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 31 16:13:15 2021 +0800 gdi32: Add more emf StretchBlt tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 1248 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 1093 insertions(+), 155 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6820ad68df159a3fc06…

1 0

Gijs Vermeulen : vcomp: Implement omp_get_num_procs().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 616e2284e038c00757eee940bb2c469531f4acdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=616e2284e038c00757eee940… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jun 4 20:10:27 2021 +0200 vcomp: Implement omp_get_num_procs(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50041 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 6 ++++-- dlls/vcomp/tests/vcomp.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 90caac83750..30bc2c63501 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -43,6 +43,7 @@ static DWORD vcomp_context_tls = TLS_OUT_OF_INDEXES; static HMODULE vcomp_module; static int vcomp_max_threads; static int vcomp_num_threads; +static int vcomp_num_procs; static BOOL vcomp_nested_fork = FALSE; static RTL_CRITICAL_SECTION vcomp_section; @@ -1001,8 +1002,8 @@ int CDECL omp_get_nested(void) int CDECL omp_get_num_procs(void) { - TRACE("stub\n"); - return 1; + TRACE("\n"); + return vcomp_num_procs; } int CDECL omp_get_num_threads(void) @@ -1843,6 +1844,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) vcomp_module = instance; vcomp_max_threads = sysinfo.dwNumberOfProcessors; vcomp_num_threads = sysinfo.dwNumberOfProcessors; + vcomp_num_procs = sysinfo.dwNumberOfProcessors; break; } diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 478bb5d7cfe..16008d17728 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -117,6 +117,7 @@ static void (CDECL *pomp_destroy_lock)(omp_lock_t *lock); static void (CDECL *pomp_destroy_nest_lock)(omp_nest_lock_t *lock); static int (CDECL *pomp_get_max_threads)(void); static int (CDECL *pomp_get_nested)(void); +static int (CDECL *pomp_get_num_procs)(void); static int (CDECL *pomp_get_num_threads)(void); static int (CDECL *pomp_get_thread_num)(void); static int (CDECL *pomp_in_parallel)(void); @@ -352,6 +353,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(omp_destroy_nest_lock); VCOMP_GET_PROC(omp_get_max_threads); VCOMP_GET_PROC(omp_get_nested); + VCOMP_GET_PROC(omp_get_num_procs); VCOMP_GET_PROC(omp_get_num_threads); VCOMP_GET_PROC(omp_get_thread_num); VCOMP_GET_PROC(omp_in_parallel); @@ -2209,11 +2211,24 @@ static void test_reduction_float_double(void) } } +static void test_omp_get_num_procs(void) +{ + SYSTEM_INFO sysinfo; + int num_procs; + + num_procs = pomp_get_num_procs(); + ok(num_procs > 0, "expected non-zero num_procs\n"); + GetSystemInfo(&sysinfo); + ok(sysinfo.dwNumberOfProcessors > 0, "expected non-zero dwNumberOfProcessors\n"); + ok(num_procs == sysinfo.dwNumberOfProcessors, "got dwNumberOfProcessors %d num_procs %d\n", sysinfo.dwNumberOfProcessors, num_procs); +} + START_TEST(vcomp) { if (!init_vcomp()) return; + test_omp_get_num_procs(); test_omp_get_num_threads(FALSE); test_omp_get_num_threads(TRUE); test_vcomp_fork();

1 0

Andrew Eikum : advapi32/tests: Avoid gcc 11 misleading-indentation warning.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 08306780dd8b407fc5d0d506791f4efc720a63ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=08306780dd8b407fc5d0d506… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 4 15:00:48 2021 -0500 advapi32/tests: Avoid gcc 11 misleading-indentation warning. dlls/advapi32/tests/cred.c:809:5: warning: this ‘else’ clause does not guard... [-Wmisleading-indentation] include/wine/test.h:116:32: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘else’ Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/cred.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 01e2a5efa33..854f5a92b1f 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -809,7 +809,7 @@ START_TEST(cred) else test_generic(); - trace("domain password:\n"); + trace("domain password:\n"); if (persists[CRED_TYPE_DOMAIN_PASSWORD] == CRED_PERSIST_NONE) skip("CRED_TYPE_DOMAIN_PASSWORD credentials are not supported or are disabled. Skipping\n"); else

1 0

Andrew Eikum : comctl32: Avoid gcc 11 maybe-uninitialized warning.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: ce8f724740542a389145abee7e43a3bbd98cbebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce8f724740542a389145abee… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 4 15:01:01 2021 -0500 comctl32: Avoid gcc 11 maybe-uninitialized warning. dlls/comctl32/monthcal.c:1783:19: warning: ‘htinfo.uHit’ may be used uninitialized [-Wmaybe-uninitialized] Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index c0bec07f477..70ea604d2c7 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1799,6 +1799,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) if(!lpht || lpht->cbSize < MCHITTESTINFO_V1_SIZE) return -1; htinfo.st = st_null; + htinfo.uHit = 0; /* we should preserve passed fields if hit area doesn't need them */ if (lpht->cbSize == sizeof(MCHITTESTINFO))

1 0

Zebediah Figura : ws2_32: Use getifaddrs() and if_nametoindex() directly in interface_bind().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 82c7da313ea68926143c715103a1d8559e83695d URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c7da313ea68926143c7151… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:24:16 2021 -0500 ws2_32: Use getifaddrs() and if_nametoindex() directly in interface_bind(). In order to avoid accessing iphlpapi. We will need to move this code to ntdll or the server, but we can't access iphlpapi from either. Even accessing a lower-level interface (i.e. ndis) is hard—we have no good way to enumerate ndis devices from either (without duplicating large parts of setupapi). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 81 ++++++++++++++++++++++++-------------------- dlls/ws2_32/ws2_32_private.h | 8 +++++ 2 files changed, 52 insertions(+), 37 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfe5ab186ee..ad2e3a1d683 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1975,62 +1975,65 @@ static int WINAPI WS2_WSARecvMsg( SOCKET s, LPWSAMSG msg, LPDWORD lpNumberOfByte */ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) { +#if defined(HAVE_GETIFADDRS) && (defined(IP_BOUND_IF) || defined(LINUX_BOUND_IF)) struct sockaddr_in *in_sock = (struct sockaddr_in *) addr; in_addr_t bind_addr = in_sock->sin_addr.s_addr; - PIP_ADAPTER_INFO adapters = NULL, adapter; + struct ifaddrs *ifaddrs, *ifaddr; + unsigned int index; BOOL ret = FALSE; - DWORD adap_size; int enable = 1; if (bind_addr == htonl(INADDR_ANY) || bind_addr == htonl(INADDR_LOOPBACK)) return FALSE; /* Not binding to a network adapter, special interface binding unnecessary. */ if (_get_fd_type(fd) != SOCK_DGRAM) return FALSE; /* Special interface binding is only necessary for UDP datagrams. */ - if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) - goto cleanup; - adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); - if (adapters == NULL || GetAdaptersInfo(adapters, &adap_size) != NO_ERROR) - goto cleanup; - /* Search the IPv4 adapter list for the appropriate binding interface */ - for (adapter = adapters; adapter != NULL; adapter = adapter->Next) - { - in_addr_t adapter_addr = (in_addr_t) inet_addr(adapter->IpAddressList.IpAddress.String); - if (bind_addr == adapter_addr) + if (getifaddrs( &ifaddrs ) < 0) return FALSE; + + for (ifaddr = ifaddrs; ifaddr != NULL; ifaddr = ifaddr->ifa_next) + { + if (ifaddr->ifa_addr && ifaddr->ifa_addr->sa_family == AF_INET + && ((struct sockaddr_in *)ifaddr->ifa_addr)->sin_addr.s_addr == bind_addr) { + index = if_nametoindex( ifaddr->ifa_name ); + if (!index) + { + ERR( "Unable to look up interface index for %s: %s\n", ifaddr->ifa_name, strerror( errno ) ); + continue; + } + #if defined(IP_BOUND_IF) /* IP_BOUND_IF sets both the incoming and outgoing restriction at once */ - if (setsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &adapter->Index, sizeof(adapter->Index)) != 0) + if (setsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &index, sizeof(index)) != 0) goto cleanup; ret = TRUE; #elif defined(LINUX_BOUND_IF) - in_addr_t ifindex = (in_addr_t) htonl(adapter->Index); - struct interface_filter specific_interface_filter; - struct sock_fprog filter_prog; - - if (setsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex)) != 0) - goto cleanup; /* Failed to suggest egress interface */ - specific_interface_filter = generic_interface_filter; - specific_interface_filter.iface_rule.k = adapter->Index; - specific_interface_filter.ip_rule.k = htonl(adapter_addr); - filter_prog.len = sizeof(generic_interface_filter)/sizeof(struct sock_filter); - filter_prog.filter = (struct sock_filter *) &specific_interface_filter; - if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog)) != 0) - goto cleanup; /* Failed to specify incoming packet filter */ - ret = TRUE; -#else - FIXME("Broadcast packets on interface-bound sockets are not currently supported on this platform, " - "receiving broadcast packets will not work on socket %04lx.\n", s); + { + in_addr_t ifindex = (in_addr_t) htonl(index); + struct interface_filter specific_interface_filter; + struct sock_fprog filter_prog; + + if (setsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex)) != 0) + goto cleanup; /* Failed to suggest egress interface */ + specific_interface_filter = generic_interface_filter; + specific_interface_filter.iface_rule.k = index; + specific_interface_filter.ip_rule.k = htonl(bind_addr); + filter_prog.len = sizeof(generic_interface_filter)/sizeof(struct sock_filter); + filter_prog.filter = (struct sock_filter *) &specific_interface_filter; + if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog)) != 0) + goto cleanup; /* Failed to specify incoming packet filter */ + ret = TRUE; + } #endif if (ret) { EnterCriticalSection(&cs_if_addr_cache); - if (if_addr_cache_size <= adapter->Index) + if (if_addr_cache_size <= index) { unsigned int new_size; in_addr_t *new; - new_size = max(if_addr_cache_size * 2, adapter->Index + 1); + new_size = max(if_addr_cache_size * 2, index + 1); if (!(new = heap_realloc(if_addr_cache, sizeof(*if_addr_cache) * new_size))) { ERR("No memory.\n"); @@ -2043,10 +2046,10 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) if_addr_cache = new; if_addr_cache_size = new_size; } - if (if_addr_cache[adapter->Index] && if_addr_cache[adapter->Index] != adapter_addr) - WARN("Adapter addr for iface index %u has changed.\n", adapter->Index); + if (if_addr_cache[index] && if_addr_cache[index] != bind_addr) + WARN("Adapter addr for iface index %u has changed.\n", index); - if_addr_cache[adapter->Index] = adapter_addr; + if_addr_cache[index] = bind_addr; LeaveCriticalSection(&cs_if_addr_cache); } break; @@ -2054,15 +2057,19 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) } /* Will soon be switching to INADDR_ANY: permit address reuse */ if (ret && setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable)) == 0) - TRACE("Socket %04lx bound to interface index %d\n", s, adapter->Index); + TRACE("Socket %04lx bound to interface index %d\n", s, index); else ret = FALSE; cleanup: if(!ret) ERR("Failed to bind to interface, receiving broadcast packets will not work on socket %04lx.\n", s); - HeapFree(GetProcessHeap(), 0, adapters); + freeifaddrs( ifaddrs ); return ret; +#else + FIXME( "Broadcast packets on interface-bound sockets are not currently supported on this platform.\n" ); + return FALSE; +#endif } /*********************************************************************** diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 527dbe903b4..c27c697a8b6 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -83,11 +83,18 @@ # include <resolv.h> #endif #ifdef HAVE_NET_IF_H +# define if_indextoname unix_if_indextoname +# define if_nametoindex unix_if_nametoindex # include <net/if.h> +# undef if_indextoname +# undef if_nametoindex #endif #ifdef HAVE_LINUX_FILTER_H # include <linux/filter.h> #endif +#ifdef HAVE_IFADDRS_H +# include <ifaddrs.h> +#endif #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> @@ -144,6 +151,7 @@ #include "winnt.h" #define USE_WC_PREFIX /* For CMSG_DATA */ #include "iphlpapi.h" +#include "netioapi.h" #include "ip2string.h" #include "wine/afd.h" #include "wine/server.h"

1 0

Zebediah Figura : ws2_32: Use IOCTL_WINE_AFD_COMPLETE_ASYNC in SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 0e05a7f8cd2ba76a1253ba1a6d8ac39fce4cd350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e05a7f8cd2ba76a1253ba1a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:24:17 2021 -0500 ws2_32: Use IOCTL_WINE_AFD_COMPLETE_ASYNC in SIO_ADDRESS_LIST_QUERY. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 26 +++++++++++++++++--------- dlls/ws2_32/tests/sock.c | 33 +++++++++++++++------------------ 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ad2e3a1d683..ab736947807 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3399,8 +3399,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID break; } - case WS_SIO_ADDRESS_LIST_QUERY: - { + case WS_SIO_ADDRESS_LIST_QUERY: + { DWORD size; TRACE("-> SIO_ADDRESS_LIST_QUERY request\n"); @@ -3415,17 +3415,19 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (GetAdaptersInfo(NULL, &size) == ERROR_BUFFER_OVERFLOW) { IP_ADAPTER_INFO *p, *table = HeapAlloc(GetProcessHeap(), 0, size); + NTSTATUS status = STATUS_SUCCESS; SOCKET_ADDRESS_LIST *sa_list; SOCKADDR_IN *sockaddr; SOCKET_ADDRESS *sa; unsigned int i; + DWORD ret = 0; DWORD num; if (!table || GetAdaptersInfo(table, &size)) { HeapFree(GetProcessHeap(), 0, table); - status = WSAEINVAL; - break; + SetLastError( WSAEINVAL ); + return -1; } for (p = table, num = 0; p; p = p->Next) @@ -3436,8 +3438,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID { *ret_size = total; HeapFree(GetProcessHeap(), 0, table); - status = WSAEFAULT; - break; + SetLastError( WSAEFAULT ); + return -1; } sa_list = out_buff; @@ -3459,14 +3461,20 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } HeapFree(GetProcessHeap(), 0, table); + + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_COMPLETE_ASYNC, &status, sizeof(status), + NULL, 0, ret_size, overlapped, completion ); + *ret_size = total; + SetLastError( ret ); + return ret ? -1 : 0; } else { WARN("unable to get IP address list\n"); - status = WSAEINVAL; + SetLastError( WSAEINVAL ); + return -1; } - break; - } + } case WS_SIO_FLUSH: FIXME("SIO_FLUSH: stub.\n"); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 592baa806c3..e99faa4096b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -9297,7 +9297,7 @@ static void test_address_list_query(void) size = 0; ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, buffer, sizeof(buffer), &size, NULL, NULL); ok(!ret, "Got unexpected ret %d.\n", ret); - todo_wine ok(!WSAGetLastError(), "Got unexpected error %d.\n", WSAGetLastError()); + ok(!WSAGetLastError(), "Got unexpected error %d.\n", WSAGetLastError()); ok(size == expect_size, "Expected size %u, got %u.\n", expect_size, size); expect_size = FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[address_list->iAddressCount]); @@ -9346,8 +9346,8 @@ static void test_address_list_query(void) ok(ret == -1, "Got unexpected ret %d.\n", ret); ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); ok(size == expect_size, "Expected size %u, got %u.\n", expect_size, size); - todo_wine ok(overlapped.Internal == 0xdeadbeef, "Got status %#x.\n", (NTSTATUS)overlapped.Internal); - todo_wine ok(overlapped.InternalHigh == 0xdeadbeef, "Got size %Iu.\n", overlapped.InternalHigh); + ok(overlapped.Internal == 0xdeadbeef, "Got status %#x.\n", (NTSTATUS)overlapped.Internal); + ok(overlapped.InternalHigh == 0xdeadbeef, "Got size %Iu.\n", overlapped.InternalHigh); overlapped.Internal = 0xdeadbeef; overlapped.InternalHigh = 0xdeadbeef; @@ -9367,8 +9367,8 @@ static void test_address_list_query(void) ok(ret == -1, "Got unexpected ret %d.\n", ret); ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); ok(size == expect_size, "Expected size %u, got %u.\n", expect_size, size); - todo_wine ok(overlapped.Internal == 0xdeadbeef, "Got status %#x.\n", (NTSTATUS)overlapped.Internal); - todo_wine ok(overlapped.InternalHigh == 0xdeadbeef, "Got size %Iu.\n", overlapped.InternalHigh); + ok(overlapped.Internal == 0xdeadbeef, "Got status %#x.\n", (NTSTATUS)overlapped.Internal); + ok(overlapped.InternalHigh == 0xdeadbeef, "Got size %Iu.\n", overlapped.InternalHigh); ok(address_list->iAddressCount == 0xcccccccc, "Got %u addresses.\n", address_list->iAddressCount); overlapped.Internal = 0xdeadbeef; @@ -9376,19 +9376,19 @@ static void test_address_list_query(void) size = 0xdeadbeef; ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, buffer, sizeof(buffer), &size, &overlapped, NULL); ok(!ret, "Got unexpected ret %d.\n", ret); - todo_wine ok(!WSAGetLastError(), "Got unexpected error %d.\n", WSAGetLastError()); + ok(!WSAGetLastError(), "Got unexpected error %d.\n", WSAGetLastError()); ok(size == expect_size, "Expected size %u, got %u.\n", expect_size, size); ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); - todo_wine ok(ret, "Got error %u.\n", GetLastError()); - todo_wine ok(!size, "Got size %u.\n", size); + ok(ret, "Got error %u.\n", GetLastError()); + ok(!size, "Got size %u.\n", size); ok(overlapped_ptr == &overlapped, "Got overlapped %p.\n", overlapped_ptr); ok(!overlapped.Internal, "Got status %#x.\n", (NTSTATUS)overlapped.Internal); - todo_wine ok(!overlapped.InternalHigh, "Got size %Iu.\n", overlapped.InternalHigh); + ok(!overlapped.InternalHigh, "Got size %Iu.\n", overlapped.InternalHigh); ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); ok(!ret, "Expected failure.\n"); - todo_wine ok(GetLastError() == WAIT_TIMEOUT, "Got error %u.\n", GetLastError()); + ok(GetLastError() == WAIT_TIMEOUT, "Got error %u.\n", GetLastError()); closesocket(s); CloseHandle(port); @@ -9408,14 +9408,11 @@ static void test_address_list_query(void) ok(size == expect_size, "got size %u\n", size); ret = SleepEx(0, TRUE); - todo_wine ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); - if (ret == WAIT_IO_COMPLETION) - { - ok(apc_count == 1, "APC was called %u times\n", apc_count); - ok(!apc_error, "got APC error %u\n", apc_error); - ok(!apc_size, "got APC size %u\n", apc_size); - ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); - } + ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); + ok(apc_count == 1, "APC was called %u times\n", apc_count); + ok(!apc_error, "got APC error %u\n", apc_error); + ok(!apc_size, "got APC size %u\n", apc_size); + ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); closesocket(s); }

1 0

Zebediah Figura : server: Don't rely on async_is_blocking() to determine whether IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE should block.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 8c26fca5c2c83ebba668578a814040de5c96bde2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c26fca5c2c83ebba668578a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:24:18 2021 -0500 server: Don't rely on async_is_blocking() to determine whether IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE should block. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 3 ++- server/async.c | 5 ----- server/file.h | 1 - server/sock.c | 13 ++++++++++++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ab736947807..3c7bfdf6edb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3639,9 +3639,10 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIO_ADDRESS_LIST_CHANGE: { + int force_async = !!overlapped; DWORD ret; - ret = server_ioctl_sock( s, IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE, in_buff, in_size, + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE, &force_async, sizeof(force_async), out_buff, out_size, ret_size, overlapped, completion ); SetLastError( ret ); return ret ? -1 : 0; diff --git a/server/async.c b/server/async.c index d6d3a8ad86a..4dedb27f3d8 100644 --- a/server/async.c +++ b/server/async.c @@ -557,11 +557,6 @@ struct thread *async_get_thread( struct async *async ) return async->thread; } -int async_is_blocking( struct async *async ) -{ - return !async->event && !async->data.apc && !async->data.apc_context; -} - /* find the first pending async in queue */ struct async *find_pending_async( struct async_queue *queue ) { diff --git a/server/file.h b/server/file.h index ba97a833c71..b8bc7645b19 100644 --- a/server/file.h +++ b/server/file.h @@ -232,7 +232,6 @@ extern void fd_copy_completion( struct fd *src, struct fd *dst ); extern struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t out_size ); extern struct iosb *async_get_iosb( struct async *async ); extern struct thread *async_get_thread( struct async *async ); -extern int async_is_blocking( struct async *async ); extern struct async *find_pending_async( struct async_queue *queue ); extern void cancel_process_asyncs( struct process *process ); diff --git a/server/sock.c b/server/sock.c index 700d4c0761a..f2450fcc541 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1882,7 +1882,17 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } case IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE: - if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) + { + int force_async; + + if (get_req_data_size() < sizeof(int)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + force_async = *(int *)get_req_data(); + + if ((sock->state & FD_WINE_NONBLOCKING) && !force_async) { set_error( STATUS_DEVICE_NOT_READY ); return 0; @@ -1891,6 +1901,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) queue_async( &sock->ifchange_q, async ); set_error( STATUS_PENDING ); return 1; + } case IOCTL_AFD_WINE_FIONBIO: if (get_req_data_size() < sizeof(int))

1 0