- Wine-Devel - list.winehq.org

[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

[PATCH 1/2] server: Grant the same access rights when req->access is zero in duplicate_token.
by Zebediah Figura Feb. 7, 2021

Feb. 7, 2021

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/token.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/token.c b/server/token.c index ec2616098c6..2ae1cb1780a 100644 --- a/server/token.c +++ b/server/token.c @@ -1358,7 +1358,8 @@ DECL_HANDLER(duplicate_token) struct token *token = token_duplicate( src_token, req->primary, req->impersonation_level, sd, NULL, 0, NULL, 0 ); if (token) { - reply->new_handle = alloc_handle_no_access_check( current->process, token, req->access, objattr->attributes ); + unsigned int access = req->access ? req->access : get_handle_access( current->process, req->handle ); + reply->new_handle = alloc_handle_no_access_check( current->process, token, access, objattr->attributes ); release_object( token ); } release_object( src_token ); -- 2.20.1

1 1

[PATCH v6 4/5] mountmgr: Add support for volume information queries.
by Erich E. Hoover Feb. 6, 2021

Feb. 6, 2021

This patch allows the mountmgr to handle the volume information request IRP, allowing volume information to be queried from the mountmgr by ntdll. v6: Have harddisk_query_volume return the same status as the IoStatus. v5: No change v4: Reordered (no content change) v3: Use SystemBuffer instead of UserBuffer (see 8e98dcd42e13bfeb5a2397ff9bf1c7f63c224e23) v2: Per Zeb's request, now storing the volume with the disk_device so that the lookup doesn't require a search. Best, Erich

1 0

[PATCH v6 2/5] ntdll: Allow NtQueryVolumeInformationFile to make async volume information queries.
by Erich E. Hoover Feb. 6, 2021

Feb. 6, 2021

This patch allows NtQueryVolumeInformationFile to pass FileFsVolumeInformation and FileFsAttributeInformation requests to the mountmgr (as well as other device drivers). These requests currently do not work for NT device paths, which results in a bunch of duplication in kernelbase (see patch 5). v6: No change v5: Fixed improper usage of io->u.Status that caused intermittent test failures in v4 patch 5 v4: Reordered (no content change) v3: No change v2: Split Best, Erich

1 0