April 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Get rid of the rebuild_nt_name() helper.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: 4e6da5942eef617e576df0f74a3617e1bc1aca27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e6da5942eef617e576df0f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 15:02:19 2021 +0200 ntdll: Get rid of the rebuild_nt_name() helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 5c68218f09d..b4d834b7855 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2963,29 +2963,6 @@ static NTSTATUS find_drive_rootA( LPCSTR *ppath, unsigned int len, int *drive_re } -/****************************************************************************** - * rebuild_nt_name - */ -static void rebuild_nt_name( const UNICODE_STRING *nameW, DWORD prefix_len, - const char *unix_name, UNICODE_STRING *nt_name ) -{ - WCHAR *buf; - DWORD len; - - while (*unix_name == '/') unix_name++; - nt_name->MaximumLength = (prefix_len + strlen(unix_name) + 2) * sizeof(WCHAR); - if (!(buf = malloc( nt_name->MaximumLength ))) return; - nt_name->Buffer = buf; - memcpy( buf, nameW->Buffer, prefix_len * sizeof(WCHAR) ); - if (prefix_len && buf[prefix_len - 1] != '\\') buf[prefix_len++] = '\\'; - buf += prefix_len; - len = ntdll_umbstowcs( unix_name, strlen(unix_name), buf, strlen(unix_name) ); - for (; len; len--, buf++) if (*buf == '/') *buf = '\\'; - *buf = 0; - nt_name->Length = (buf - nt_name->Buffer) * sizeof(WCHAR); -} - - /****************************************************************************** * find_file_id * @@ -3110,7 +3087,15 @@ done: { TRACE( "%s -> %s\n", wine_dbgstr_longlong(file_id), debugstr_a(unix_name) ); *unix_name_ret = unix_name; - if (nt_name) rebuild_nt_name( attr->ObjectName, 0, unix_name, nt_name ); + + nt_name->MaximumLength = (strlen(unix_name) + 1) * sizeof(WCHAR); + if ((nt_name->Buffer = malloc( nt_name->MaximumLength ))) + { + DWORD i, len = ntdll_umbstowcs( unix_name, strlen(unix_name), nt_name->Buffer, strlen(unix_name) ); + nt_name->Buffer[len] = 0; + nt_name->Length = len * sizeof(WCHAR); + for (i = 0; i < len; i++) if (nt_name->Buffer[i] == '/') nt_name->Buffer[i] = '\\'; + } } else {

1 0

Alexandre Julliard : ntdll: Reimplement file system redirection using NT pathname comparisons.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: 7ef35b33936682c01f1c825b7d1b07567a691c12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ef35b33936682c01f1c825b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 12:58:22 2021 +0200 ntdll: Reimplement file system redirection using NT pathname comparisons. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 11 +- dlls/ntdll/unix/file.c | 362 ++++++++++++++++++++++------------------- dlls/ntdll/unix/loader.c | 19 ++- dlls/ntdll/unix/process.c | 22 ++- dlls/ntdll/unix/unix_private.h | 7 +- 5 files changed, 239 insertions(+), 182 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ef35b33936682c01f1c…

1 0

Hugh McMaster : reg/tests: Test output of keys with a trailing backslash.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: f6566bf7493dea2511238ad59aae873168b16963 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6566bf7493dea2511238ad5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 15 21:03:21 2021 +1000 reg/tests: Test output of keys with a trailing backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 410f4b250d3..c475d288fd8 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -233,6 +233,10 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); compare_query(buf, test6, FALSE, 0); + read_reg_output("reg query HKCU\\" KEY_BASE "\\ /s", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test6, FALSE, TODO_REG_COMPARE); + read_reg_output("reg query HKCU\\" KEY_BASE " /v Wine /s", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, "got exit code %d, expected 0\n", r);

1 0

Gijs Vermeulen : cmd: Use terminated strings.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: 0bf71745f0df0181844be37afb6c0975a6ccb2f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bf71745f0df0181844be37a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Apr 15 17:11:53 2021 +0200 cmd: Use terminated strings. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48486 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 48 ++++++++++++++++++++++-------------------------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 45 +++++++++++++++++---------------------------- 3 files changed, 40 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf71745f0df0181844b…

1 0

Nikolay Sivov : dwrite/tests: Add glyph origin tests for sideways mode.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: defb7d9c76c3c2a4d5f9945d20be4aa2353fb0ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=defb7d9c76c3c2a4d5f9945d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 15 14:38:39 2021 +0300 dwrite/tests: Add glyph origin tests for sideways mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 58 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 54e279ea11e..9f814504a44 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8445,31 +8445,46 @@ static void test_HasKerningPairs(void) ok(ref == 0, "factory not released, %u\n", ref); } +static float get_scaled_metric(const DWRITE_GLYPH_RUN *run, float metric, const DWRITE_FONT_METRICS *m) +{ + return run->fontEmSize * metric / m->designUnitsPerEm; +} + static void get_expected_glyph_origins(D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *run, D2D1_POINT_2F *origins) { + DWRITE_GLYPH_METRICS glyph_metrics[2]; + DWRITE_FONT_METRICS metrics; unsigned int i; + HRESULT hr; + + IDWriteFontFace_GetMetrics(run->fontFace, &metrics); + + hr = IDWriteFontFace_GetDesignGlyphMetrics(run->fontFace, run->glyphIndices, run->glyphCount, glyph_metrics, + run->isSideways); + ok(hr == S_OK, "Failed to get glyph metrics, hr %#x.\n", hr); if (run->bidiLevel & 1) { - DWRITE_GLYPH_METRICS glyph_metrics[2]; - DWRITE_FONT_METRICS metrics; float advance; - HRESULT hr; - - hr = IDWriteFontFace_GetDesignGlyphMetrics(run->fontFace, run->glyphIndices, run->glyphCount, glyph_metrics, FALSE); - ok(hr == S_OK, "Failed to get glyph metrics, hr %#x.\n", hr); - - IDWriteFontFace_GetMetrics(run->fontFace, &metrics); - advance = run->fontEmSize * glyph_metrics[0].advanceWidth / metrics.designUnitsPerEm; + advance = get_scaled_metric(run, run->isSideways ? glyph_metrics[0].advanceHeight : + glyph_metrics[0].advanceWidth, &metrics); baseline_origin.x -= advance; for (i = 0; i < run->glyphCount; ++i) { - origins[i].x = baseline_origin.x - run->glyphOffsets[i].advanceOffset; - origins[i].y = baseline_origin.y - run->glyphOffsets[i].ascenderOffset; + origins[i] = baseline_origin; + + if (run->isSideways) + { + origins[i].x += get_scaled_metric(run, glyph_metrics[i].verticalOriginY, &metrics); + origins[i].y += metrics.designUnitsPerEm / (4.0f * run->fontEmSize); + } + + origins[i].x -= run->glyphOffsets[i].advanceOffset; + origins[i].y -= run->glyphOffsets[i].ascenderOffset; baseline_origin.x -= run->glyphAdvances[i]; } @@ -8478,8 +8493,16 @@ static void get_expected_glyph_origins(D2D1_POINT_2F baseline_origin, const DWRI { for (i = 0; i < run->glyphCount; ++i) { - origins[i].x = baseline_origin.x + run->glyphOffsets[i].advanceOffset; - origins[i].y = baseline_origin.y - run->glyphOffsets[i].ascenderOffset; + origins[i] = baseline_origin; + + if (run->isSideways) + { + origins[i].x += get_scaled_metric(run, glyph_metrics[i].verticalOriginY, &metrics); + origins[i].y += metrics.designUnitsPerEm / (4.0f * run->fontEmSize); + } + + origins[i].x += run->glyphOffsets[i].advanceOffset; + origins[i].y -= run->glyphOffsets[i].ascenderOffset; baseline_origin.x += run->glyphAdvances[i]; } @@ -8494,12 +8517,18 @@ static void test_ComputeGlyphOrigins(void) float advances[2]; DWRITE_GLYPH_OFFSET offsets[2]; unsigned int bidi_level; + unsigned int sideways; } origins_tests[] = { { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0 } } }, { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0.3f, 0.5f }, { -0.1f, 0.9f } } }, { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0 } }, 1 }, + + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0 } }, 0, 1 }, + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0.3f, 0.5f }, { -0.1f, 0.9f } }, 0, 1 }, + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0 } }, 1, 1 }, + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0.3f, 0.5f }, { -0.1f, 0.9f } }, 1, 1 }, }; IDWriteFactory4 *factory; DWRITE_GLYPH_RUN run; @@ -8529,7 +8558,7 @@ static void test_ComputeGlyphOrigins(void) run.glyphIndices = glyphs; run.glyphAdvances = origins_tests[i].advances; run.glyphOffsets = origins_tests[i].offsets; - run.isSideways = FALSE; + run.isSideways = !!origins_tests[i].sideways; run.bidiLevel = origins_tests[i].bidi_level; get_expected_glyph_origins(origins_tests[i].baseline_origin, &run, expected_origins); @@ -8539,6 +8568,7 @@ static void test_ComputeGlyphOrigins(void) ok(hr == S_OK, "%u: failed to compute glyph origins, hr %#x.\n", i, hr); for (j = 0; j < run.glyphCount; ++j) { + todo_wine_if(run.isSideways) ok(!memcmp(&origins[j], &expected_origins[j], sizeof(origins[j])), "%u: unexpected origin[%u] (%f, %f) - (%f, %f).\n", i, j, origins[j].x, origins[j].y, expected_origins[j].x, expected_origins[j].y);

1 0

Hans Leidekker : wldap32: Move support for dn functions to the Unix library.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: e21c9596d36678dc28f6872382a3f1ca5189eac7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e21c9596d36678dc28f68723… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 15 12:20:06 2021 +0200 wldap32: Move support for dn functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/dn.c | 127 +++++++++++++++++-------------------------------- dlls/wldap32/libldap.c | 24 ++++++++++ dlls/wldap32/libldap.h | 8 ++++ 3 files changed, 75 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e21c9596d36678dc28f6…

1 0

Hans Leidekker : wldap32: Move support for search functions to the Unix library.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: 22b26a20dc97865f3edc203eae224228131862f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22b26a20dc97865f3edc203e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 15 12:20:05 2021 +0200 wldap32: Move support for search functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/dn.c | 2 +- dlls/wldap32/error.c | 2 +- dlls/wldap32/libldap.c | 98 ++++++++++- dlls/wldap32/libldap.h | 36 ++++ dlls/wldap32/misc.c | 250 +++++++++++++-------------- dlls/wldap32/parse.c | 10 +- dlls/wldap32/search.c | 458 +++++++++++++------------------------------------ dlls/wldap32/value.c | 4 +- 8 files changed, 379 insertions(+), 481 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=22b26a20dc97865f3edc…

1 0

Hans Leidekker : wldap32: Move support for error functions to the Unix library.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: 0f3f49e12c4203ccbb42e5d3a035207972451ad3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f3f49e12c4203ccbb42e5d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 15 12:20:04 2021 +0200 wldap32: Move support for error functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/error.c | 64 +++++++++++++++++++++----------------------------- dlls/wldap32/libldap.c | 7 ++++++ dlls/wldap32/libldap.h | 3 +++ 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c index 11ecaf8763b..c1b678788f0 100644 --- a/dlls/wldap32/error.c +++ b/dlls/wldap32/error.c @@ -18,47 +18,41 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "windef.h" #include "winbase.h" #include "winuser.h" #include "winnls.h" -#include "winldap_private.h" -#include "wldap32.h" #include "wine/debug.h" +#include "winldap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +extern HINSTANCE hwldap32 DECLSPEC_HIDDEN; + ULONG map_error( int error ) { switch (error) { -#ifdef HAVE_LDAP_H - case LDAP_SERVER_DOWN: return WLDAP32_LDAP_SERVER_DOWN; - case LDAP_LOCAL_ERROR: return WLDAP32_LDAP_LOCAL_ERROR; - case LDAP_DECODING_ERROR: return WLDAP32_LDAP_DECODING_ERROR; - case LDAP_TIMEOUT: return WLDAP32_LDAP_TIMEOUT; - case LDAP_AUTH_UNKNOWN: return WLDAP32_LDAP_AUTH_UNKNOWN; - case LDAP_FILTER_ERROR: return WLDAP32_LDAP_FILTER_ERROR; - case LDAP_USER_CANCELLED: return WLDAP32_LDAP_USER_CANCELLED; - case LDAP_PARAM_ERROR: return WLDAP32_LDAP_PARAM_ERROR; - case LDAP_NO_MEMORY: return WLDAP32_LDAP_NO_MEMORY; - case LDAP_CONNECT_ERROR: return WLDAP32_LDAP_CONNECT_ERROR; - case LDAP_NOT_SUPPORTED: return WLDAP32_LDAP_NOT_SUPPORTED; - case LDAP_CONTROL_NOT_FOUND: return WLDAP32_LDAP_CONTROL_NOT_FOUND; - case LDAP_NO_RESULTS_RETURNED: return WLDAP32_LDAP_NO_RESULTS_RETURNED; - case LDAP_MORE_RESULTS_TO_RETURN: return WLDAP32_LDAP_MORE_RESULTS_TO_RETURN; - case LDAP_CLIENT_LOOP: return WLDAP32_LDAP_CLIENT_LOOP; - case LDAP_REFERRAL_LIMIT_EXCEEDED: return WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED; -#endif + case 0: return WLDAP32_LDAP_SUCCESS; + case -1: return WLDAP32_LDAP_SERVER_DOWN; + case -2: return WLDAP32_LDAP_LOCAL_ERROR; + case -3: return WLDAP32_LDAP_ENCODING_ERROR; + case -4: return WLDAP32_LDAP_DECODING_ERROR; + case -5: return WLDAP32_LDAP_TIMEOUT; + case -6: return WLDAP32_LDAP_AUTH_UNKNOWN; + case -7: return WLDAP32_LDAP_FILTER_ERROR; + case -8: return WLDAP32_LDAP_USER_CANCELLED; + case -9: return WLDAP32_LDAP_PARAM_ERROR; + case -10: return WLDAP32_LDAP_NO_MEMORY; + case -11: return WLDAP32_LDAP_CONNECT_ERROR; + case -12: return WLDAP32_LDAP_NOT_SUPPORTED; + case -13: return WLDAP32_LDAP_CONTROL_NOT_FOUND; + case -14: return WLDAP32_LDAP_NO_RESULTS_RETURNED; + case -15: return WLDAP32_LDAP_MORE_RESULTS_TO_RETURN; + case -16: return WLDAP32_LDAP_CLIENT_LOOP; + case -17: return WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED; default: return error; } } @@ -68,7 +62,7 @@ ULONG map_error( int error ) * * See ldap_err2stringW. */ -PCHAR CDECL ldap_err2stringA( ULONG err ) +char * CDECL ldap_err2stringA( ULONG err ) { static char buf[256] = ""; @@ -98,7 +92,7 @@ PCHAR CDECL ldap_err2stringA( ULONG err ) * The returned string is statically allocated, you must not * free this string. */ -PWCHAR CDECL ldap_err2stringW( ULONG err ) +WCHAR * CDECL ldap_err2stringW( ULONG err ) { static WCHAR buf[256] = { 0 }; @@ -151,22 +145,19 @@ void CDECL WLDAP32_ldap_perror( WLDAP32_LDAP *ld, const PCHAR msg ) */ ULONG CDECL WLDAP32_ldap_result2error( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res, ULONG free ) { - ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; -#ifdef HAVE_LDAP + ULONG ret; int error; TRACE( "(%p, %p, 0x%08x)\n", ld, res, free ); if (!ld || !res) return ~0u; - ret = ldap_parse_result( ld->ld, res, &error, NULL, NULL, NULL, NULL, free ); - - if (ret == LDAP_SUCCESS) + ret = map_error( ldap_funcs->ldap_parse_result( ld->ld, res, &error, NULL, NULL, NULL, NULL, free ) ); + if (ret == WLDAP32_LDAP_SUCCESS) ret = error; else ret = ~0u; -#endif return ret; } @@ -303,7 +294,6 @@ ULONG CDECL LdapMapErrorToWin32( ULONG err ) { TRACE( "(0x%08x)\n", err ); - if (err >= ARRAY_SIZE( WLDAP32_errormap )) - return ERROR_DS_GENERIC_ERROR; + if (err >= ARRAY_SIZE( WLDAP32_errormap )) return ERROR_DS_GENERIC_ERROR; return WLDAP32_errormap[err]; } diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c index be2e540721b..11a3707f200 100644 --- a/dlls/wldap32/libldap.c +++ b/dlls/wldap32/libldap.c @@ -357,6 +357,12 @@ void CDECL wrap_ldap_memfree( void *ptr ) return ldap_memfree( ptr ); } +int CDECL wrap_ldap_parse_result( void *ld, void *res, int *errcode, char **matcheddn, char **errmsg, + char ***referrals, LDAPControlU ***serverctrls, int free ) +{ + return ldap_parse_result( ld, res, errcode, matcheddn, errmsg, referrals, (LDAPControl ***)serverctrls, free ); +} + int CDECL wrap_ldap_sasl_bind( void *ld, const char *dn, const char *mech, struct bervalU *cred, LDAPControlU **serverctrls, LDAPControlU **clientctrls, int *msgid ) { @@ -426,6 +432,7 @@ static const struct ldap_funcs funcs = wrap_ldap_delete_ext, wrap_ldap_delete_ext_s, wrap_ldap_memfree, + wrap_ldap_parse_result, wrap_ldap_sasl_bind, wrap_ldap_sasl_bind_s, wrap_ldap_sasl_interactive_bind_s, diff --git a/dlls/wldap32/libldap.h b/dlls/wldap32/libldap.h index dde7d3eba17..5ebc5bacd54 100644 --- a/dlls/wldap32/libldap.h +++ b/dlls/wldap32/libldap.h @@ -104,6 +104,8 @@ extern int CDECL wrap_ldap_create_vlv_control(void *, LDAPVLVInfoU *, LDAPContro extern int CDECL wrap_ldap_delete_ext(void *, const char *, LDAPControlU **, LDAPControlU **, ULONG *) DECLSPEC_HIDDEN; extern int CDECL wrap_ldap_delete_ext_s(void *, const char *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN; extern void CDECL wrap_ldap_memfree(void *) DECLSPEC_HIDDEN; +extern int CDECL wrap_ldap_parse_result(void *, void *, int *, char **, char **, char ***, LDAPControlU ***, + int) DECLSPEC_HIDDEN; extern int CDECL wrap_ldap_sasl_bind(void *, const char *, const char *, struct bervalU *, LDAPControlU **, LDAPControlU **, int *) DECLSPEC_HIDDEN; extern int CDECL wrap_ldap_sasl_bind_s(void *, const char *, const char *, struct bervalU *, LDAPControlU **, @@ -141,6 +143,7 @@ struct ldap_funcs int (CDECL *ldap_delete_ext)(void *, const char *, LDAPControlU **, LDAPControlU **, ULONG *); int (CDECL *ldap_delete_ext_s)(void *, const char *, LDAPControlU **, LDAPControlU **); void (CDECL *ldap_memfree)(void *); + int (CDECL *ldap_parse_result)(void *, void *, int *, char **, char **, char ***, LDAPControlU ***, int); int (CDECL *ldap_sasl_bind)(void *, const char *, const char *, struct bervalU *, LDAPControlU **, LDAPControlU **, int *); int (CDECL *ldap_sasl_bind_s)(void *, const char *, const char *, struct bervalU *, LDAPControlU **,

1 0

Hans Leidekker : wldap32: Move support for delete functions to the Unix library.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: d8a2463abca104814f306bc7bc953d1a1f4a4471 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8a2463abca104814f306bc7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 15 12:20:03 2021 +0200 wldap32: Move support for delete functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/delete.c | 214 +++++++++++-------------------------------------- dlls/wldap32/libldap.c | 15 ++++ dlls/wldap32/libldap.h | 4 + 3 files changed, 68 insertions(+), 165 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8a2463abca104814f30…

1 0

Alexandre Julliard : ntdll: Move create_startup_info() to env.c.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: 8e7c6422e5a196b0e9acfaa4ca05b73468ec5a9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e7c6422e5a196b0e9acfaa4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 14:44:50 2021 +0200 ntdll: Move create_startup_info() to env.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 69 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 68 ----------------------------------------- dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 70 insertions(+), 68 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 01d4f3ea418..33f96c65a7c 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1897,6 +1897,23 @@ static inline WCHAR *get_dos_path( WCHAR *nt_path ) return nt_path; } +static inline const WCHAR *get_params_string( const RTL_USER_PROCESS_PARAMETERS *params, + const UNICODE_STRING *str ) +{ + if (params->Flags & PROCESS_PARAMS_FLAG_NORMALIZED) return str->Buffer; + return (const WCHAR *)((const char *)params + (UINT_PTR)str->Buffer); +} + +static inline DWORD append_string( void **ptr, const RTL_USER_PROCESS_PARAMETERS *params, + const UNICODE_STRING *str ) +{ + const WCHAR *buffer = get_params_string( params, str ); + memcpy( *ptr, buffer, str->Length ); + *ptr = (WCHAR *)*ptr + str->Length / sizeof(WCHAR); + return str->Length; +} + + /************************************************************************* * build_initial_params * @@ -2113,6 +2130,58 @@ void init_startup_info(void) } +/*********************************************************************** + * create_startup_info + */ +void *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *params, DWORD *info_size ) +{ + startup_info_t *info; + DWORD size; + void *ptr; + + size = sizeof(*info); + size += params->CurrentDirectory.DosPath.Length; + size += params->DllPath.Length; + size += params->ImagePathName.Length; + size += params->CommandLine.Length; + size += params->WindowTitle.Length; + size += params->Desktop.Length; + size += params->ShellInfo.Length; + size += params->RuntimeInfo.Length; + size = (size + 1) & ~1; + *info_size = size; + + if (!(info = calloc( size, 1 ))) return NULL; + + info->debug_flags = params->DebugFlags; + info->console_flags = params->ConsoleFlags; + info->console = wine_server_obj_handle( params->ConsoleHandle ); + info->hstdin = wine_server_obj_handle( params->hStdInput ); + info->hstdout = wine_server_obj_handle( params->hStdOutput ); + info->hstderr = wine_server_obj_handle( params->hStdError ); + info->x = params->dwX; + info->y = params->dwY; + info->xsize = params->dwXSize; + info->ysize = params->dwYSize; + info->xchars = params->dwXCountChars; + info->ychars = params->dwYCountChars; + info->attribute = params->dwFillAttribute; + info->flags = params->dwFlags; + info->show = params->wShowWindow; + + ptr = info + 1; + info->curdir_len = append_string( &ptr, params, &params->CurrentDirectory.DosPath ); + info->dllpath_len = append_string( &ptr, params, &params->DllPath ); + info->imagepath_len = append_string( &ptr, params, &params->ImagePathName ); + info->cmdline_len = append_string( &ptr, params, &params->CommandLine ); + info->title_len = append_string( &ptr, params, &params->WindowTitle ); + info->desktop_len = append_string( &ptr, params, &params->Desktop ); + info->shellinfo_len = append_string( &ptr, params, &params->ShellInfo ); + info->runtime_len = append_string( &ptr, params, &params->RuntimeInfo ); + return info; +} + + /************************************************************************** * NtGetNlsSectionPtr (NTDLL.@) */ diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 8d50f5a006d..bd3bba7ca8f 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -156,74 +156,6 @@ static char **build_argv( const UNICODE_STRING *cmdline, int reserved ) } -static inline const WCHAR *get_params_string( const RTL_USER_PROCESS_PARAMETERS *params, - const UNICODE_STRING *str ) -{ - if (params->Flags & PROCESS_PARAMS_FLAG_NORMALIZED) return str->Buffer; - return (const WCHAR *)((const char *)params + (UINT_PTR)str->Buffer); -} - -static inline DWORD append_string( void **ptr, const RTL_USER_PROCESS_PARAMETERS *params, - const UNICODE_STRING *str ) -{ - const WCHAR *buffer = get_params_string( params, str ); - memcpy( *ptr, buffer, str->Length ); - *ptr = (WCHAR *)*ptr + str->Length / sizeof(WCHAR); - return str->Length; -} - -/*********************************************************************** - * create_startup_info - */ -static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *params, DWORD *info_size ) -{ - startup_info_t *info; - DWORD size; - void *ptr; - - size = sizeof(*info); - size += params->CurrentDirectory.DosPath.Length; - size += params->DllPath.Length; - size += params->ImagePathName.Length; - size += params->CommandLine.Length; - size += params->WindowTitle.Length; - size += params->Desktop.Length; - size += params->ShellInfo.Length; - size += params->RuntimeInfo.Length; - size = (size + 1) & ~1; - *info_size = size; - - if (!(info = calloc( size, 1 ))) return NULL; - - info->debug_flags = params->DebugFlags; - info->console_flags = params->ConsoleFlags; - info->console = wine_server_obj_handle( params->ConsoleHandle ); - info->hstdin = wine_server_obj_handle( params->hStdInput ); - info->hstdout = wine_server_obj_handle( params->hStdOutput ); - info->hstderr = wine_server_obj_handle( params->hStdError ); - info->x = params->dwX; - info->y = params->dwY; - info->xsize = params->dwXSize; - info->ysize = params->dwYSize; - info->xchars = params->dwXCountChars; - info->ychars = params->dwYCountChars; - info->attribute = params->dwFillAttribute; - info->flags = params->dwFlags; - info->show = params->wShowWindow; - - ptr = info + 1; - info->curdir_len = append_string( &ptr, params, &params->CurrentDirectory.DosPath ); - info->dllpath_len = append_string( &ptr, params, &params->DllPath ); - info->imagepath_len = append_string( &ptr, params, &params->ImagePathName ); - info->cmdline_len = append_string( &ptr, params, &params->CommandLine ); - info->title_len = append_string( &ptr, params, &params->WindowTitle ); - info->desktop_len = append_string( &ptr, params, &params->Desktop ); - info->shellinfo_len = append_string( &ptr, params, &params->ShellInfo ); - info->runtime_len = append_string( &ptr, params, &params->RuntimeInfo ); - return info; -} - - /*********************************************************************** * get_so_file_info */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 4c50307fc6b..e1732b0017a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -141,6 +141,7 @@ extern struct ldt_copy __wine_ldt_copy DECLSPEC_HIDDEN; extern void init_environment( int argc, char *argv[], char *envp[] ) DECLSPEC_HIDDEN; extern void init_startup_info(void) DECLSPEC_HIDDEN; +extern void *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *params, DWORD *info_size ) DECLSPEC_HIDDEN; extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) DECLSPEC_HIDDEN; extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN;

1 0