February 2021 - Wine-Devel - list.winehq.org

[PATCH 4/6] adsldp: implement the ADS_SEARCHPREF_CHASE_REFERRALS search preference
by Damjan Jovanovic Feb. 8, 2021

Feb. 8, 2021

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/adsldp/adsldp.c | 46 +++++++++++++++++++++++++++++++++++++++++++ dlls/wldap32/option.c | 14 ++++++++++++- include/iads.idl | 7 +++++++ include/winldap.h | 3 +++ 4 files changed, 69 insertions(+), 1 deletion(-)

2 1

[PATCH 1/3] dwrite: Call shaper masks setup only when doing substitutions.
by Nikolay Sivov Feb. 8, 2021

Feb. 8, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Thanks, Henri. dlls/dwrite/opentype.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0e5b8c75f62..dc5fb3f11e8 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3525,6 +3525,16 @@ struct lookup unsigned int auto_zwj : 1; }; +static unsigned int opentype_layout_is_subst_context(const struct scriptshaping_context *context) +{ + return context->table == &context->cache->gsub; +} + +static unsigned int opentype_layout_is_pos_context(const struct scriptshaping_context *context) +{ + return context->table == &context->cache->gpos; +} + static unsigned int opentype_layout_get_gsubgpos_subtable(const struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable, unsigned int *lookup_type) { @@ -3534,8 +3544,8 @@ static unsigned int opentype_layout_get_gsubgpos_subtable(const struct scriptsha subtable_offset += lookup->offset; - if ((context->table == &context->cache->gsub && lookup->type != GSUB_LOOKUP_EXTENSION_SUBST) || - (context->table == &context->cache->gpos && lookup->type != GPOS_LOOKUP_EXTENSION_POSITION)) + if ((opentype_layout_is_subst_context(context) && lookup->type != GSUB_LOOKUP_EXTENSION_SUBST) || + (opentype_layout_is_pos_context(context) && lookup->type != GPOS_LOOKUP_EXTENSION_POSITION)) { *lookup_type = lookup->type; return subtable_offset; @@ -3616,7 +3626,7 @@ static void glyph_iterator_init(struct scriptshaping_context *context, unsigned iter->match_data = NULL; iter->glyph_data = NULL; /* Context matching iterators will get these fixed up. */ - iter->ignore_zwnj = context->table == &context->cache->gpos; + iter->ignore_zwnj = !!opentype_layout_is_pos_context(context); iter->ignore_zwj = context->auto_zwj; } @@ -4663,7 +4673,7 @@ static void opentype_layout_set_glyph_masks(struct scriptshaping_context *contex for (g = 0; g < context->glyph_count; ++g) context->glyph_infos[g].mask = context->global_mask; - if (context->shaper->setup_masks) + if (opentype_layout_is_subst_context(context) && context->shaper->setup_masks) context->shaper->setup_masks(context, features); for (r = 0, start_char = 0; r < context->user_features.range_count; ++r) @@ -6154,7 +6164,7 @@ BOOL opentype_layout_check_feature(struct scriptshaping_context *context, unsign opentype_layout_collect_lookups(context, script_index, language_index, &features, context->table, &lookups); - func_is_covered = context->table == &context->cache->gsub ? opentype_layout_gsub_lookup_is_glyph_covered : + func_is_covered = opentype_layout_is_subst_context(context) ? opentype_layout_gsub_lookup_is_glyph_covered : opentype_layout_gpos_lookup_is_glyph_covered; for (i = 0; i < lookups.count; ++i) -- 2.30.0

1 2

[PATCH 1/3] ntdll: Always return at least sizeof(PRIVILEGE_SET) in NtAccessCheck().
by Zebediah Figura Feb. 8, 2021

Feb. 8, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/security.c | 10 ++-------- dlls/ntdll/unix/security.c | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index bd57609447e..e6078996e19 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1367,7 +1367,7 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); todo_wine ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); - todo_wine ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); + ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); /* Key access mask - insufficient returnlength */ SetLastError(0xdeadbeef); @@ -1382,7 +1382,7 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); todo_wine ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); - todo_wine ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); + ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); } else win_skip("NtAccessCheck unavailable. Skipping.\n"); @@ -1513,7 +1513,6 @@ todo_wine todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, @@ -1529,7 +1528,6 @@ todo_wine todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, @@ -1545,7 +1543,6 @@ todo_wine todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, @@ -1560,7 +1557,6 @@ todo_wine PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); ok(ret, "AccessCheck failed with error %d\n", GetLastError()); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); ok(AccessStatus && (Access == KEY_READ), "AccessCheck failed to grant access with error %d\n", GetLastError()); @@ -1630,7 +1626,6 @@ todo_wine todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); - todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, @@ -1646,7 +1641,6 @@ todo_wine todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); - todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 6f945b24e68..8a5b1515ba9 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -732,7 +732,7 @@ NTSTATUS WINAPI NtAccessCheck( PSECURITY_DESCRIPTOR descr, HANDLE token, ACCESS_ status = wine_server_call( req ); - *retlen = offsetof( PRIVILEGE_SET, Privilege ) + reply->privileges_len; + *retlen = max( offsetof( PRIVILEGE_SET, Privilege ) + reply->privileges_len, sizeof(PRIVILEGE_SET) ); privs->PrivilegeCount = reply->privileges_len / sizeof(LUID_AND_ATTRIBUTES); if (status == STATUS_SUCCESS) { -- 2.20.1

1 2

[PATCH 5/6] adsldp: only report search errors when iterating results
by Damjan Jovanovic Feb. 7, 2021

Feb. 7, 2021

It's unclear whether MSDN's claim that searches are deferred until GetFirstRow()/GetNextRow() is true, but .NET is extremely unhappy if IDirectorySearch::ExecuteSearch() fails, and even if a query with 0 results returns something other than S_ADS_NOMORE_ROWS. For now, at least delay returning the search error until GetFirstRow()/GetNextRow(). Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/adsldp/adsldp.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)

2 1

[PATCH 3/6] adsldp: implement the ADS_SEARCHPREF_SIZE_LIMIT search preference
by Damjan Jovanovic Feb. 7, 2021

Feb. 7, 2021

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/adsldp/adsldp.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)

1 0

[PATCH 2/6] adsldp: split the user into a domain and a username, where possible
by Damjan Jovanovic Feb. 7, 2021

Feb. 7, 2021

Extensive tests show that, for the secure authentication case, adsldp's IADsOpenDSObject::OpenDSObject() and wldap32's ldap_bind_s() both agree on success/failure and generate equivalent network packets, only when IADsOpenDSObject::OpenDSObject() splits up "domain\user" style usernames into SEC_WINNT_AUTH_IDENTITY_W's Domain and User, while ldap_bind_s() receives them already split up like that, regardless of the domain's format (domain, domain.local) or even correctness. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50634 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/adsldp/adsldp.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-)

1 0

[PATCH 1/6] activeds: implement ADsSetLastError() and ADsGetLastError()
by Damjan Jovanovic Feb. 7, 2021

Feb. 7, 2021

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/activeds/activeds_main.c | 90 ++++++++++++++++++++++++++++++++-- dlls/activeds/tests/activeds.c | 69 ++++++++++++++++++++++++++ include/adshlp.h | 2 + 3 files changed, 157 insertions(+), 4 deletions(-)

1 0

[PATCH 0/6] active/adsldp/wldap32 patches
by Damjan Jovanovic Feb. 7, 2021

Feb. 7, 2021

This patchset gets .NET's System.DirectoryServices API to a minimally functional level. It can now be used to (at least) log in and search, using the DirectoryEntry and DirectorySearcher classes. Damjan Jovanovic

1 0

[PATCH] wininet: Add spaces to 3 ERR() and fix 1 'escape' copypasta.
by Serge Gautherie Feb. 7, 2021

Feb. 7, 2021

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/wininet/http.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c770c31..ff8db3b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3389,7 +3389,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, URL_ESCAPE_SPACES_ONLY); if (rc != S_OK) { - ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(lpszObjectName),rc); + ERR("Unable to canonicalize string! (%s) (%d)\n", debugstr_w(lpszObjectName), rc); lstrcpyW(request->path,lpszObjectName); } }else { @@ -4204,13 +4204,13 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); rc = UrlEscapeW(path, dummy, &needed, URL_ESCAPE_SPACES_ONLY); if (rc != E_POINTER) - ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); + ERR("Unable to escape string! (%s) (%d)\n", debugstr_w(path), rc); request->path = heap_alloc(needed*sizeof(WCHAR)); rc = UrlEscapeW(path, request->path, &needed, URL_ESCAPE_SPACES_ONLY); if (rc != S_OK) { - ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); + ERR("Unable to escape string! (%s) (%d)\n", debugstr_w(path), rc); lstrcpyW(request->path, path); } heap_free(path); -- 2.10.0.windows.1

1 0

[PATCH] gdiplus/metafile: Implement GdipRecordMetafileFileName.
by Chao Long Feb. 7, 2021

Feb. 7, 2021

Signed-off-by: Chao Long <longchao(a)uniontech.com> --- dlls/gdiplus/metafile.c | 205 ++++++++++++++++++++-------------------- 1 file changed, 103 insertions(+), 102 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d506d0dc8bf..5ff6b113c3d 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -759,109 +759,10 @@ static GpStatus METAFILE_WriteEndOfFile(GpMetafile *metafile) GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF *frameRect, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) { - HDC record_dc; - REAL dpix, dpiy; - REAL framerect_factor_x, framerect_factor_y; - RECT rc, *lprc; - GpStatus stat; TRACE("(%p %d %s %d %p %p)\n", hdc, type, debugstr_rectf(frameRect), frameUnit, desc, metafile); - if (!hdc || type < EmfTypeEmfOnly || type > EmfTypeEmfPlusDual || !metafile) - return InvalidParameter; - - dpix = (REAL)GetDeviceCaps(hdc, HORZRES) / GetDeviceCaps(hdc, HORZSIZE) * 25.4; - dpiy = (REAL)GetDeviceCaps(hdc, VERTRES) / GetDeviceCaps(hdc, VERTSIZE) * 25.4; - - if (frameRect) - { - switch (frameUnit) - { - case MetafileFrameUnitPixel: - framerect_factor_x = 2540.0 / dpix; - framerect_factor_y = 2540.0 / dpiy; - break; - case MetafileFrameUnitPoint: - framerect_factor_x = framerect_factor_y = 2540.0 / 72.0; - break; - case MetafileFrameUnitInch: - framerect_factor_x = framerect_factor_y = 2540.0; - break; - case MetafileFrameUnitDocument: - framerect_factor_x = framerect_factor_y = 2540.0 / 300.0; - break; - case MetafileFrameUnitMillimeter: - framerect_factor_x = framerect_factor_y = 100.0; - break; - case MetafileFrameUnitGdi: - framerect_factor_x = framerect_factor_y = 1.0; - break; - default: - return InvalidParameter; - } - - rc.left = framerect_factor_x * frameRect->X; - rc.top = framerect_factor_y * frameRect->Y; - rc.right = rc.left + framerect_factor_x * frameRect->Width; - rc.bottom = rc.top + framerect_factor_y * frameRect->Height; - - lprc = &rc; - } - else - lprc = NULL; - - record_dc = CreateEnhMetaFileW(hdc, NULL, lprc, desc); - - if (!record_dc) - return GenericError; - - *metafile = heap_alloc_zero(sizeof(GpMetafile)); - if(!*metafile) - { - DeleteEnhMetaFile(CloseEnhMetaFile(record_dc)); - return OutOfMemory; - } - - (*metafile)->image.type = ImageTypeMetafile; - (*metafile)->image.flags = ImageFlagsNone; - (*metafile)->image.palette = NULL; - (*metafile)->image.xres = dpix; - (*metafile)->image.yres = dpiy; - (*metafile)->bounds.X = (*metafile)->bounds.Y = 0.0; - (*metafile)->bounds.Width = (*metafile)->bounds.Height = 1.0; - (*metafile)->unit = UnitPixel; - (*metafile)->metafile_type = type; - (*metafile)->record_dc = record_dc; - (*metafile)->comment_data = NULL; - (*metafile)->comment_data_size = 0; - (*metafile)->comment_data_length = 0; - (*metafile)->limit_dpi = 96; - (*metafile)->hemf = NULL; - (*metafile)->printer_display = (GetDeviceCaps(record_dc, TECHNOLOGY) == DT_RASPRINTER); - (*metafile)->logical_dpix = (REAL)GetDeviceCaps(record_dc, LOGPIXELSX); - (*metafile)->logical_dpiy = (REAL)GetDeviceCaps(record_dc, LOGPIXELSY); - list_init(&(*metafile)->containers); - - if (!frameRect) - { - (*metafile)->auto_frame = TRUE; - (*metafile)->auto_frame_min.X = 0; - (*metafile)->auto_frame_min.Y = 0; - (*metafile)->auto_frame_max.X = -1; - (*metafile)->auto_frame_max.Y = -1; - } - - stat = METAFILE_WriteHeader(*metafile, hdc); - - if (stat != Ok) - { - DeleteEnhMetaFile(CloseEnhMetaFile(record_dc)); - heap_free(*metafile); - *metafile = NULL; - return OutOfMemory; - } - - return stat; + return GdipRecordMetafileFileName(NULL, hdc, type, frameRect, frameUnit, desc, metafile); } /***************************************************************************** @@ -4266,10 +4167,110 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR* fileName, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) { - FIXME("%s %p %d %s %d %s %p stub!\n", debugstr_w(fileName), hdc, type, debugstr_rectf(pFrameRect), + HDC record_dc; + REAL dpix, dpiy; + REAL framerect_factor_x, framerect_factor_y; + RECT rc, *lprc; + GpStatus stat; + + TRACE("%s %p %d %s %d %s %p\n", debugstr_w(fileName), hdc, type, debugstr_rectf(pFrameRect), frameUnit, debugstr_w(desc), metafile); - return NotImplemented; + if (!hdc || type < EmfTypeEmfOnly || type > EmfTypeEmfPlusDual || !metafile) + return InvalidParameter; + + dpix = (REAL)GetDeviceCaps(hdc, HORZRES) / GetDeviceCaps(hdc, HORZSIZE) * 25.4; + dpiy = (REAL)GetDeviceCaps(hdc, VERTRES) / GetDeviceCaps(hdc, VERTSIZE) * 25.4; + + if (pFrameRect) + { + switch (frameUnit) + { + case MetafileFrameUnitPixel: + framerect_factor_x = 2540.0 / dpix; + framerect_factor_y = 2540.0 / dpiy; + break; + case MetafileFrameUnitPoint: + framerect_factor_x = framerect_factor_y = 2540.0 / 72.0; + break; + case MetafileFrameUnitInch: + framerect_factor_x = framerect_factor_y = 2540.0; + break; + case MetafileFrameUnitDocument: + framerect_factor_x = framerect_factor_y = 2540.0 / 300.0; + break; + case MetafileFrameUnitMillimeter: + framerect_factor_x = framerect_factor_y = 100.0; + break; + case MetafileFrameUnitGdi: + framerect_factor_x = framerect_factor_y = 1.0; + break; + default: + return InvalidParameter; + } + + rc.left = framerect_factor_x * pFrameRect->X; + rc.top = framerect_factor_y * pFrameRect->Y; + rc.right = rc.left + framerect_factor_x * pFrameRect->Width; + rc.bottom = rc.top + framerect_factor_y * pFrameRect->Height; + + lprc = &rc; + } + else + lprc = NULL; + + record_dc = CreateEnhMetaFileW(hdc, fileName, lprc, desc); + + if (!record_dc) + return GenericError; + + *metafile = heap_alloc_zero(sizeof(GpMetafile)); + if(!*metafile) + { + DeleteEnhMetaFile(CloseEnhMetaFile(record_dc)); + return OutOfMemory; + } + + (*metafile)->image.type = ImageTypeMetafile; + (*metafile)->image.flags = ImageFlagsNone; + (*metafile)->image.palette = NULL; + (*metafile)->image.xres = dpix; + (*metafile)->image.yres = dpiy; + (*metafile)->bounds.X = (*metafile)->bounds.Y = 0.0; + (*metafile)->bounds.Width = (*metafile)->bounds.Height = 1.0; + (*metafile)->unit = UnitPixel; + (*metafile)->metafile_type = type; + (*metafile)->record_dc = record_dc; + (*metafile)->comment_data = NULL; + (*metafile)->comment_data_size = 0; + (*metafile)->comment_data_length = 0; + (*metafile)->limit_dpi = 96; + (*metafile)->hemf = NULL; + (*metafile)->printer_display = (GetDeviceCaps(record_dc, TECHNOLOGY) == DT_RASPRINTER); + (*metafile)->logical_dpix = (REAL)GetDeviceCaps(record_dc, LOGPIXELSX); + (*metafile)->logical_dpiy = (REAL)GetDeviceCaps(record_dc, LOGPIXELSY); + list_init(&(*metafile)->containers); + + if (!pFrameRect) + { + (*metafile)->auto_frame = TRUE; + (*metafile)->auto_frame_min.X = 0; + (*metafile)->auto_frame_min.Y = 0; + (*metafile)->auto_frame_max.X = -1; + (*metafile)->auto_frame_max.Y = -1; + } + + stat = METAFILE_WriteHeader(*metafile, hdc); + + if (stat != Ok) + { + DeleteEnhMetaFile(CloseEnhMetaFile(record_dc)); + heap_free(*metafile); + *metafile = NULL; + return OutOfMemory; + } + + return stat; } GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR* fileName, HDC hdc, EmfType type, -- 2.20.1

2 1