May 2006 - Wine-commits - list.winehq.org

James Hawkins : advpack: INF install is implemented so fix the documentation.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 5524a4c57452eff0f25ae1fb6897988d283bf0f7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5524a4c57452eff0f25ae1f… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 20:07:28 2006 -0500 advpack: INF install is implemented so fix the documentation. --- dlls/advpack/install.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 4c495af..8c44f94 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -797,9 +797,6 @@ HRESULT WINAPI RunSetupCommandA(HWND hWn * Not supported on this Windows version * E_UNEXPECTED Unexpected error * HRESULT_FROM_WIN32(GetLastError()) Some other error - * - * BUGS - * INF install unimplemented. */ HRESULT WINAPI RunSetupCommandW(HWND hWnd, LPCWSTR szCmdName, LPCWSTR szInfSection, LPCWSTR szDir,

1 0

James Hawkins : advpack: Implement the PerUserInstall command.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: e0aa23a168ca1b1630df0d30da989162142ec439 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0aa23a168ca1b1630df0d3… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 20:06:34 2006 -0500 advpack: Implement the PerUserInstall command. --- dlls/advpack/install.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index c4b89a7..4c495af 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -57,12 +57,56 @@ typedef struct _ADVInfo typedef HRESULT (*iterate_fields_func)(HINF hinf, PCWSTR field, void *arg); /* Advanced INF commands */ +static const WCHAR PerUserInstall[] = {'P','e','r','U','s','e','r','I','n','s','t','a','l','l',0}; static const WCHAR RegisterOCXs[] = {'R','e','g','i','s','t','e','r','O','C','X','s',0}; static const WCHAR RunPostSetupCommands[] = { 'R','u','n','P','o','s','t','S','e','t','u','p','C','o','m','m','a','n','d','s',0 }; /* Advanced INF callbacks */ +static HRESULT per_user_install_callback(HINF hinf, PCWSTR field, void *arg) +{ + PERUSERSECTIONW per_user; + INFCONTEXT context; + DWORD size; + + static const WCHAR disp_name[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; + static const WCHAR version[] = {'V','e','r','s','i','o','n',0}; + static const WCHAR is_installed[] = {'I','s','I','n','s','t','a','l','l','e','d',0}; + static const WCHAR comp_id[] = {'C','o','m','p','o','n','e','n','t','I','D',0}; + static const WCHAR guid[] = {'G','U','I','D',0}; + static const WCHAR locale[] = {'L','o','c','a','l','e',0}; + static const WCHAR stub_path[] = {'S','t','u','b','P','a','t','h',0}; + + per_user.bRollback = FALSE; + per_user.dwIsInstalled = 0; + + SetupGetLineTextW(NULL, hinf, field, disp_name, per_user.szDispName, + sizeof(per_user.szDispName) / sizeof(WCHAR), &size); + + SetupGetLineTextW(NULL, hinf, field, version, per_user.szVersion, + sizeof(per_user.szVersion) / sizeof(WCHAR), &size); + + if (SetupFindFirstLineW(hinf, field, is_installed, &context)) + { + SetupGetIntField(&context, 1, (PINT)&per_user.dwIsInstalled); + } + + SetupGetLineTextW(NULL, hinf, field, comp_id, per_user.szCompID, + sizeof(per_user.szCompID) / sizeof(WCHAR), &size); + + SetupGetLineTextW(NULL, hinf, field, guid, per_user.szGUID, + sizeof(per_user.szGUID) / sizeof(WCHAR), &size); + + SetupGetLineTextW(NULL, hinf, field, locale, per_user.szLocale, + sizeof(per_user.szLocale) / sizeof(WCHAR), &size); + + SetupGetLineTextW(NULL, hinf, field, stub_path, per_user.szStub, + sizeof(per_user.szStub) / sizeof(WCHAR), &size); + + return SetPerUserSecValuesW(&per_user); +} + static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, void *arg) { HMODULE hm; @@ -252,6 +296,11 @@ static HRESULT adv_install(ADVInfo *info if (hr != S_OK) return hr; + hr = iterate_section_fields(info->hinf, info->install_sec, + PerUserInstall, per_user_install_callback, info); + if (hr != S_OK) + return hr; + hr = iterate_section_fields(info->hinf, info->install_sec, RunPostSetupCommands, run_post_setup_commands_callback, info); if (hr != S_OK)

1 0

James Hawkins : advpack: Leave room for the NULL terminator in the working_dir string.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: b3347c49a1759699166ee1deba54c92160ddba6d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3347c49a1759699166ee1d… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 20:02:48 2006 -0500 advpack: Leave room for the NULL terminator in the working_dir string. --- dlls/advpack/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 1987b93..c4b89a7 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -306,11 +306,11 @@ HRESULT install_init(LPCWSTR inf_filenam } else { - len = lstrlenW(working_dir); + len = lstrlenW(working_dir) + 1; ptr = working_dir; } - info->working_dir = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + info->working_dir = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!info->working_dir) return E_OUTOFMEMORY;

1 0

James Hawkins : advpack: NULL-terminate the source path.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 48b55afa56326a71db2ba1a3008a4447543e17c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=48b55afa56326a71db2ba1a… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 20:00:59 2006 -0500 advpack: NULL-terminate the source path. --- dlls/advpack/install.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 451c297..1987b93 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -628,6 +628,7 @@ HRESULT WINAPI LaunchINFSectionExW(HWND cabinfo.pszInf = get_parameter(&cmdline_ptr, ','); cabinfo.pszSection = get_parameter(&cmdline_ptr, ','); cabinfo.pszCab = get_parameter(&cmdline_ptr, ','); + *cabinfo.szSrcPath = '\0'; flags = get_parameter(&cmdline_ptr, ','); if (flags)

1 0

James Hawkins : advpack: Return the hresult in ExecuteCabW.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 9c6e762e6d594b31227ef8962837fb5c5fb26491 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c6e762e6d594b31227ef89… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 19:59:31 2006 -0500 advpack: Return the hresult in ExecuteCabW. --- dlls/advpack/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 6432406..451c297 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -469,7 +469,7 @@ HRESULT WINAPI ExecuteCabW(HWND hwnd, CA done: install_release(&info); - return S_OK; + return hr; } /***********************************************************************

1 0

James Hawkins : advpack: Clean up the formatting of RegInstall to match the rest of the file.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 05c23edaef85a16e5e519980af662b284e0e1475 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=05c23edaef85a16e5e51998… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 19:57:48 2006 -0500 advpack: Clean up the formatting of RegInstall to match the rest of the file. --- dlls/advpack/reg.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index f1ab8e2..0fec624 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -236,15 +236,20 @@ HRESULT WINAPI RegInstallW(HMODULE hm, L goto done; /* Write the additional string table */ - if (pstTable) for(i = 0; i < pstTable->cEntries; i++) { - WCHAR tmp_value[MAX_PATH + 2]; - - tmp_value[0] = '\"'; - lstrcpyW(tmp_value + 1, pstTable->pse[i].pszValue); - lstrcatW(tmp_value, quote); - - WritePrivateProfileStringW(Strings, pstTable->pse[i].pszName, tmp_value, tmp_ini_path); + if (pstTable) + { + for(i = 0; i < pstTable->cEntries; i++) + { + WCHAR tmp_value[MAX_PATH + 2]; + + tmp_value[0] = '\"'; + lstrcpyW(tmp_value + 1, pstTable->pse[i].pszValue); + lstrcatW(tmp_value, quote); + + WritePrivateProfileStringW(Strings, pstTable->pse[i].pszName, tmp_value, tmp_ini_path); + } } + /* flush cache */ WritePrivateProfileStringW(NULL, NULL, NULL, tmp_ini_path);

1 0

James Hawkins : advpack: Perform an Advanced INF-level install in RegInstall.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: d049c37af28ce29d1053563cfb04516241b5102f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d049c37af28ce29d1053563… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 19:57:23 2006 -0500 advpack: Perform an Advanced INF-level install in RegInstall. --- dlls/advpack/reg.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 63801e4..f1ab8e2 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -222,8 +222,10 @@ static HRESULT write_predefined_strings( HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstTable) { int i; + CABINFOW cabinfo; WCHAR tmp_ini_path[MAX_PATH]; HINF hinf = INVALID_HANDLE_VALUE; + HRESULT hr = E_FAIL; TRACE("(%p, %s, %p)\n", hm, debugstr_w(pszSection), pstTable); @@ -246,20 +248,13 @@ HRESULT WINAPI RegInstallW(HMODULE hm, L /* flush cache */ WritePrivateProfileStringW(NULL, NULL, NULL, tmp_ini_path); + /* FIXME: read AdvOptions val for dwFlags */ + ZeroMemory(&cabinfo, sizeof(CABINFOW)); + cabinfo.pszInf = tmp_ini_path; + cabinfo.pszSection = (LPWSTR)pszSection; + cabinfo.dwFlags = 0; - if((hinf = SetupOpenInfFileW(tmp_ini_path, NULL, INF_STYLE_WIN4, NULL)) == - INVALID_HANDLE_VALUE) { - ERR("Setupapi can't open inf\n"); - goto done; - } - - /* append any layout files */ - SetupOpenAppendInfFileW(NULL, hinf, NULL); - - /* Need to do a lot more here */ - SetupInstallFromInfSectionW(NULL, hinf, pszSection, - SPINST_INIFILES | SPINST_REGISTRY | SPINST_PROFILEITEMS, - HKEY_LOCAL_MACHINE, NULL, 0, NULL, NULL, NULL, NULL); + hr = ExecuteCabW(NULL, &cabinfo, NULL); done: if (hinf != INVALID_HANDLE_VALUE) @@ -267,7 +262,7 @@ done: DeleteFileW(tmp_ini_path); - return S_OK; + return hr; } /***********************************************************************

1 0

James Hawkins : advpack: Factor out writing predefined strings into write_predefined_strings.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: f1631103aa89f1b0249f964de0212985cf020a3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1631103aa89f1b0249f964… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 19:56:49 2006 -0500 advpack: Factor out writing predefined strings into write_predefined_strings. --- dlls/advpack/reg.c | 66 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 43 insertions(+), 23 deletions(-) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 13911ce..63801e4 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -38,6 +38,7 @@ static const WCHAR MOD_PATH[] = {'_','M' static const WCHAR SYS_MOD_PATH[] = {'_','S','Y','S','_','M','O','D','_','P','A','T','H',0}; static const WCHAR SystemRoot[] = {'S','y','s','t','e','m','R','o','o','t',0}; static const WCHAR escaped_SystemRoot[] = {'%','S','y','s','t','e','m','R','o','o','t','%',0}; +static const WCHAR quote[] = {'\"',0}; static BOOL get_temp_ini_path(LPWSTR name) { @@ -170,6 +171,39 @@ HRESULT WINAPI RegInstallA(HMODULE hm, L return hr; } +static HRESULT write_predefined_strings(HMODULE hm, LPWSTR ini_path) +{ + WCHAR mod_path[MAX_PATH + 2]; + WCHAR sys_mod_path[MAX_PATH + 2]; + WCHAR sys_root[MAX_PATH]; + + *mod_path = '\"'; + if (!GetModuleFileNameW(hm, mod_path + 1, sizeof(mod_path) / sizeof(WCHAR) - 2)) + return E_FAIL; + + lstrcatW(mod_path, quote); + WritePrivateProfileStringW(Strings, MOD_PATH, mod_path, ini_path); + + *sys_root = '\0'; + GetEnvironmentVariableW(SystemRoot, sys_root, sizeof(sys_root) / sizeof(WCHAR)); + + if(!strncmpiW(sys_root, mod_path + 1, strlenW(sys_root))) + { + *sys_mod_path = '\"'; + strcpyW(sys_mod_path + 1, escaped_SystemRoot); + strcatW(sys_mod_path, mod_path + 1 + strlenW(sys_root)); + } + else + { + FIXME("SYS_MOD_PATH needs more work\n"); + strcpyW(sys_mod_path, mod_path); + } + + WritePrivateProfileStringW(Strings, SYS_MOD_PATH, sys_mod_path, ini_path); + + return S_OK; +} + /*********************************************************************** * RegInstallW (advpack.@) * @@ -189,32 +223,15 @@ HRESULT WINAPI RegInstallW(HMODULE hm, L { int i; WCHAR tmp_ini_path[MAX_PATH]; - WCHAR mod_path[MAX_PATH + 2], sys_mod_path[MAX_PATH + 2], sys_root[MAX_PATH]; - HINF hinf; - static const WCHAR quote[] = {'\"',0}; + HINF hinf = INVALID_HANDLE_VALUE; TRACE("(%p, %s, %p)\n", hm, debugstr_w(pszSection), pstTable); if(!create_tmp_ini_file(hm, tmp_ini_path)) return E_FAIL; - /* Write a couple of pre-defined strings */ - mod_path[0] = '\"'; - GetModuleFileNameW(hm, mod_path + 1, sizeof(mod_path)/sizeof(WCHAR) - 2); - strcatW(mod_path, quote); - WritePrivateProfileStringW(Strings, MOD_PATH, mod_path, tmp_ini_path); - - *sys_root = '\0'; - GetEnvironmentVariableW(SystemRoot, sys_root, sizeof(sys_root)/sizeof(WCHAR)); - if(!strncmpiW(sys_root, mod_path + 1, strlenW(sys_root))) { - sys_mod_path[0] = '\"'; - strcpyW(sys_mod_path + 1, escaped_SystemRoot); - strcatW(sys_mod_path, mod_path + 1 + strlenW(sys_root)); - } else { - FIXME("SYS_MOD_PATH needs more work\n"); - strcpyW(sys_mod_path, mod_path); - } - WritePrivateProfileStringW(Strings, SYS_MOD_PATH, sys_mod_path, tmp_ini_path); + if (write_predefined_strings(hm, tmp_ini_path)) + goto done; /* Write the additional string table */ if (pstTable) for(i = 0; i < pstTable->cEntries; i++) { @@ -233,7 +250,7 @@ HRESULT WINAPI RegInstallW(HMODULE hm, L if((hinf = SetupOpenInfFileW(tmp_ini_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) { ERR("Setupapi can't open inf\n"); - return E_FAIL; + goto done; } /* append any layout files */ @@ -243,8 +260,11 @@ HRESULT WINAPI RegInstallW(HMODULE hm, L SetupInstallFromInfSectionW(NULL, hinf, pszSection, SPINST_INIFILES | SPINST_REGISTRY | SPINST_PROFILEITEMS, HKEY_LOCAL_MACHINE, NULL, 0, NULL, NULL, NULL, NULL); - - SetupCloseInfFile(hinf); + +done: + if (hinf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hinf); + DeleteFileW(tmp_ini_path); return S_OK;

1 0

James Hawkins : advpack: Ignore the return value from the OCX registration.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 4b9311b5b20816fc59efeb3dacf005e00c059cf1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b9311b5b20816fc59efeb3… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 19:53:49 2006 -0500 advpack: Ignore the return value from the OCX registration. --- dlls/advpack/advpack.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index cde1c52..82071a4 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -443,7 +443,8 @@ HRESULT do_ocx_reg(HMODULE hocx, BOOL do if (!reg_func) return E_FAIL; - return reg_func(); + reg_func(); + return S_OK; } /***********************************************************************

1 0

Hans Leidekker : wldap32: Document the search functions.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: f43fd5ec1b3d30368908f71584e58cfe94c85a8d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f43fd5ec1b3d30368908f71… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Apr 21 16:38:01 2006 +0200 wldap32: Document the search functions. --- dlls/wldap32/search.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/search.c b/dlls/wldap32/search.c index 99304ee..e01a4e1 100644 --- a/dlls/wldap32/search.c +++ b/dlls/wldap32/search.c @@ -41,6 +41,11 @@ #include "wldap32.h" WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +/*********************************************************************** + * ldap_searchA (WLDAP32.@) + * + * See ldap_searchW. + */ ULONG ldap_searchA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter, PCHAR attrs[], ULONG attrsonly ) { @@ -79,6 +84,29 @@ #endif return ret; } +/*********************************************************************** + * ldap_searchW (WLDAP32.@) + * + * Search a directory tree (asynchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * base [I] Starting point for the search. + * scope [I] Search scope. One of LDAP_SCOPE_BASE, + * LDAP_SCOPE_ONELEVEL and LDAP_SCOPE_SUBTREE. + * filter [I] Search filter. + * attrs [I] Attributes to return. + * attrsonly [I] Return no values, only attributes. + * + * RETURNS + * Success: Message ID of the search operation. + * Failure: ~0UL + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. Cancel the operation by calling ldap_abandon + * with the message ID. + */ ULONG ldap_searchW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter, PWCHAR attrs[], ULONG attrsonly ) { @@ -124,6 +152,11 @@ #endif return ret; } +/*********************************************************************** + * ldap_search_extA (WLDAP32.@) + * + * See ldap_search_extW. + */ ULONG ldap_search_extA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter, PCHAR attrs[], ULONG attrsonly, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG timelimit, ULONG sizelimit, ULONG *message ) @@ -177,6 +210,34 @@ #endif return ret; } +/*********************************************************************** + * ldap_search_extW (WLDAP32.@) + * + * Search a directory tree (asynchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * base [I] Starting point for the search. + * scope [I] Search scope. One of LDAP_SCOPE_BASE, + * LDAP_SCOPE_ONELEVEL and LDAP_SCOPE_SUBTREE. + * filter [I] Search filter. + * attrs [I] Attributes to return. + * attrsonly [I] Return no values, only attributes. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * timelimit [I] Timeout in seconds. + * sizelimit [I] Maximum number of entries to return. Zero means unlimited. + * message [O] Message ID of the search operation. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. Cancel the operation by calling ldap_abandon + * with the message ID. + */ ULONG ldap_search_extW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, ULONG *message ) @@ -233,6 +294,11 @@ #endif return ret; } +/*********************************************************************** + * ldap_search_ext_sA (WLDAP32.@) + * + * See ldap_search_ext_sW. + */ ULONG ldap_search_ext_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter, PCHAR attrs[], ULONG attrsonly, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, struct l_timeval* timeout, ULONG sizelimit, WLDAP32_LDAPMessage **res ) @@ -285,6 +351,32 @@ #endif return ret; } +/*********************************************************************** + * ldap_search_ext_sW (WLDAP32.@) + * + * Search a directory tree (synchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * base [I] Starting point for the search. + * scope [I] Search scope. One of LDAP_SCOPE_BASE, + * LDAP_SCOPE_ONELEVEL and LDAP_SCOPE_SUBTREE. + * filter [I] Search filter. + * attrs [I] Attributes to return. + * attrsonly [I] Return no values, only attributes. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * timeout [I] Timeout in seconds. + * sizelimit [I] Maximum number of entries to return. Zero means unlimited. + * res [O] Results of the search operation. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_msgfree to free the results. + */ ULONG ldap_search_ext_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, struct l_timeval* timeout, ULONG sizelimit, WLDAP32_LDAPMessage **res ) @@ -337,6 +429,11 @@ #endif return ret; } +/*********************************************************************** + * ldap_search_sA (WLDAP32.@) + * + * See ldap_search_sW. + */ ULONG ldap_search_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter, PCHAR attrs[], ULONG attrsonly, WLDAP32_LDAPMessage **res ) { @@ -375,6 +472,28 @@ #endif return ret; } +/*********************************************************************** + * ldap_search_sW (WLDAP32.@) + * + * Search a directory tree (synchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * base [I] Starting point for the search. + * scope [I] Search scope. One of LDAP_SCOPE_BASE, + * LDAP_SCOPE_ONELEVEL and LDAP_SCOPE_SUBTREE. + * filter [I] Search filter. + * attrs [I] Attributes to return. + * attrsonly [I] Return no values, only attributes. + * res [O] Results of the search operation. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_msgfree to free the results. + */ ULONG ldap_search_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, WLDAP32_LDAPMessage **res ) { @@ -414,6 +533,11 @@ #endif return ret; } +/*********************************************************************** + * ldap_search_stA (WLDAP32.@) + * + * See ldap_search_stW. + */ ULONG ldap_search_stA( WLDAP32_LDAP *ld, const PCHAR base, ULONG scope, const PCHAR filter, PCHAR attrs[], ULONG attrsonly, struct l_timeval *timeout, WLDAP32_LDAPMessage **res ) @@ -455,6 +579,29 @@ #endif return ret; } +/*********************************************************************** + * ldap_search_stW (WLDAP32.@) + * + * Search a directory tree (synchronous operation). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * base [I] Starting point for the search. + * scope [I] Search scope. One of LDAP_SCOPE_BASE, + * LDAP_SCOPE_ONELEVEL and LDAP_SCOPE_SUBTREE. + * filter [I] Search filter. + * attrs [I] Attributes to return. + * attrsonly [I] Return no values, only attributes. + * timeout [I] Timeout in seconds. + * res [O] Results of the search operation. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_msgfree to free the results. + */ ULONG ldap_search_stW( WLDAP32_LDAP *ld, const PWCHAR base, ULONG scope, const PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, struct l_timeval *timeout, WLDAP32_LDAPMessage **res )

1 0