wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Gijs Vermeulen : cmd: Use terminated strings.
by Alexandre Julliard 15 Apr '21

15 Apr '21

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 15 Apr '21

15 Apr '21

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

Hugh McMaster : reg/tests: Refactor 'add' tests into registry types, keys and syntax checks.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 45b66285c38462bb57e8ab8a577f8df2dba15363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45b66285c38462bb57e8ab8a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 15 23:14:59 2021 +1000 reg/tests: Refactor 'add' tests into registry types, keys and syntax checks. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 253 +++++++++++++++++++++++++++++++---------------- 1 file changed, 167 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=45b66285c38462bb57e8…

1 0

Hugh McMaster : reg/tests: Test output of keys with a trailing backslash.
by Alexandre Julliard 15 Apr '21

15 Apr '21

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

Hugh McMaster : reg/tests: Compare output of some 'query' recursion tests.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: f4b4398d797382f238f6a21da259fed0d0e2a286 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4b4398d797382f238f6a21d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 15 21:03:20 2021 +1000 reg/tests: Compare output of some 'query' recursion tests. Recursively querying a registry key for a given value name produces an extra line specifying the number of matches found. This line is locale-specific, so we only exclude it from the comparison on a test-by-test basis. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 51 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index af0cc3848a4..410f4b250d3 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -84,12 +84,23 @@ static BOOL read_reg_output_(const char *file, unsigned line, const char *cmd, return bret; } -#define compare_query(b,e,todo) compare_query_(__FILE__,__LINE__,b,e,todo) +#define compare_query(b,e,c,todo) compare_query_(__FILE__,__LINE__,b,e,c,todo) static void compare_query_(const char *file, unsigned line, const BYTE *buf, - const char *expected, DWORD todo) + const char *expected, BOOL cmp_len, DWORD todo) { - todo_wine_if (todo & TODO_REG_COMPARE) - lok(!strcmp((char *)buf, expected), "query output does not match expected output\n"); + const char *str = (const char *)buf; + const char *err = "query output does not match expected output"; + + if (!cmp_len) + { + todo_wine_if (todo & TODO_REG_COMPARE) + lok(!strcmp(str, expected), "%s\n", err); + } + else + { + todo_wine_if (todo & TODO_REG_COMPARE) + lok(!strncmp(str, expected, strlen(expected)), "%s\n", err); + } } /* Unit tests */ @@ -121,6 +132,22 @@ static void test_query(void) "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey\r\n" " Test4 REG_DWORD 0xabc\r\n\r\n"; + const char *test6 = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n" + " Test2 REG_DWORD 0x123\r\n" + " Wine REG_SZ First instance\r\n\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey\r\n" + " Test3 REG_SZ Some string data\r\n" + " Test4 REG_DWORD 0xabc\r\n" + " Wine REG_SZ Second instance\r\n\r\n"; + + const char *test7 = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\r\n" + " Wine REG_SZ First instance\r\n\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey\r\n" + " Wine REG_SZ Second instance\r\n\r\n"; + DWORD r, dword = 0x123; HKEY key, subkey; BYTE buf[512]; @@ -162,7 +189,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test1, 0); + compare_query(buf, test1, FALSE, 0); run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), @@ -170,7 +197,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE " /v Test1", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test2, 0); + compare_query(buf, test2, FALSE, 0); run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test2", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -182,7 +209,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test3, TODO_REG_COMPARE); + compare_query(buf, test3, FALSE, TODO_REG_COMPARE); add_value(subkey, "Test3", REG_SZ, "Some string data", 16); dword = 0xabc; @@ -190,24 +217,26 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE "\\subkey", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test4, 0); + compare_query(buf, test4, FALSE, 0); run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test3", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); read_reg_output("reg query HKCU\\" KEY_BASE "\\subkey /v Test4", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test5, 0); + compare_query(buf, test5, FALSE, 0); add_value(subkey, "Wine", REG_SZ, "Second instance", 16); /* Test recursion */ - run_reg_exe("reg query HKCU\\" KEY_BASE " /s", &r); + 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, 0); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine /s", &r); + 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); + compare_query(buf, test7, TRUE, 0); add_value(key, NULL, REG_SZ, "Empty", 6); add_value(subkey, NULL, REG_SZ, "Empty", 6);

1 0

Hans Leidekker : wldap32: Move support for extended functions to the Unix library.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: b0f347b4fccb8437e3aa7f1a4b6ffc3abe9b9cfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0f347b4fccb8437e3aa7f1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 15 12:20:07 2021 +0200 wldap32: Move support for extended 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/extended.c | 175 ++++++++++++++++-------------------------------- dlls/wldap32/libldap.c | 17 +++++ dlls/wldap32/libldap.h | 8 +++ 3 files changed, 84 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0f347b4fccb8437e3aa…

1 0

Hans Leidekker : wldap32: Move support for dn functions to the Unix library.
by Alexandre Julliard 15 Apr '21

15 Apr '21

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 15 Apr '21

15 Apr '21

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 15 Apr '21

15 Apr '21

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 15 Apr '21

15 Apr '21

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

← Newer
1
...
45
46
47
48
49
50
51
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021