March 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : krnl386: Get rid of DOS floppy disk support.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 7f2aef05066111362df6d789ec6108890f321b1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f2aef05066111362df6d789… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 19:23:09 2020 +0100 krnl386: Get rid of DOS floppy disk support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dosexe.h | 3 - dlls/krnl386.exe16/int13.c | 305 ---------------------------------------- dlls/krnl386.exe16/interrupts.c | 2 +- 4 files changed, 1 insertion(+), 310 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f2aef05066111362df6…

1 0

Alexandre Julliard : krnl386: Get rid of DOS Soundblaster support.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: a432ce86a74c4685e9ae0280b3d75a757697cfef URL: https://source.winehq.org/git/wine.git/?a=commit;h=a432ce86a74c4685e9ae0280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 19:23:14 2020 +0100 krnl386: Get rid of DOS Soundblaster support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 3 +- dlls/krnl386.exe16/dosexe.h | 4 - dlls/krnl386.exe16/ioports.c | 9 - dlls/krnl386.exe16/soundblaster.c | 373 -------------------------------------- 4 files changed, 1 insertion(+), 388 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a432ce86a74c4685e9ae…

1 0

Alexandre Julliard : krnl386: Get rid of DOS DMA support.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 14091b19ae21be2f22fb651b5b10c6edafa0a1de URL: https://source.winehq.org/git/wine.git/?a=commit;h=14091b19ae21be2f22fb651b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 19:23:20 2020 +0100 krnl386: Get rid of DOS DMA support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dma.c | 385 ----------------------------------------- dlls/krnl386.exe16/dosexe.h | 5 - dlls/krnl386.exe16/ioports.c | 84 --------- 4 files changed, 475 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=14091b19ae21be2f22fb…

1 0

Rémi Bernon : kernel32/tests: Add tests for ContinueDebugEvent with DBG_REPLY_LATER.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: a96393fe260a7c67f3ab7a176bc80a4a5ba61d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a96393fe260a7c67f3ab7a17… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 24 16:05:49 2020 +0100 kernel32/tests: Add tests for ContinueDebugEvent with DBG_REPLY_LATER. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 237 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 236 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a96393fe260a7c67f3ab…

1 0

Gijs Vermeulen : cmd: Use wide character string literals in batch.c.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 5fd548fc9b17fe5010704031b260cee574f737c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fd548fc9b17fe5010704031… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Mar 24 21:12:50 2020 +0100 cmd: Use wide character string literals in batch.c. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index f494b80ae2..371f75af54 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -224,8 +224,7 @@ WCHAR *WCMD_parameter_with_delims (WCHAR *s, int n, WCHAR **start, WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, BOOL raw, BOOL wholecmdline) { - static const WCHAR defaultDelims[] = { ' ', '\t', ',', '=', ';', '\0' }; - return WCMD_parameter_with_delims (s, n, start, raw, wholecmdline, defaultDelims); + return WCMD_parameter_with_delims (s, n, start, raw, wholecmdline, L" \t,=;"); } /**************************************************************************** @@ -537,11 +536,10 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* 2. Handle 'a' : Output attributes (File doesn't have to exist) */ if (wmemchr(firstModifier, 'a', modifierLen) != NULL) { - WCHAR defaults[] = {'-','-','-','-','-','-','-','-','-','\0'}; doneModifier = TRUE; if (exists) { - lstrcpyW(thisoutput, defaults); + lstrcpyW(thisoutput, L"---------"); if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) thisoutput[0]='d'; if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY) @@ -589,12 +587,11 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* FIXME: Output full 64 bit size (sprintf does not support I64 here) */ ULONG/*64*/ fullsize = /*(fileInfo.nFileSizeHigh << 32) +*/ fileInfo.nFileSizeLow; - static const WCHAR fmt[] = {'%','u','\0'}; doneModifier = TRUE; if (exists) { if (finaloutput[0] != 0x00) lstrcatW(finaloutput, spaceW); - wsprintfW(thisoutput, fmt, fullsize); + wsprintfW(thisoutput, L"%u", fullsize); lstrcatW(finaloutput, thisoutput); } }

1 0

Gijs Vermeulen : cmd: Use wide character string literals in directory.c.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: e737aafa8e0beca5c53557ea2d37ed92263dbb38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e737aafa8e0beca5c53557ea… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Mar 24 21:12:51 2020 +0100 cmd: Use wide character string literals in directory.c. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/directory.c | 68 ++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 49 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index c38bdfce04..41e1f4e929 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -220,8 +220,7 @@ static void WCMD_getfileowner(WCHAR *filename, WCHAR *owner, int ownerlen) { /* Convert to a username */ if (LookupAccountSidW(NULL, pSID, name, &nameLen, domain, &domainLen, &nameuse)) { - static const WCHAR fmt[] = {'%','s','%','c','%','s','\0'}; - swprintf(owner, ownerlen, fmt, domain, '\\', name); + swprintf(owner, ownerlen, L"%s%c%s", domain, '\\', name); } heap_free(secBuffer); } @@ -253,10 +252,6 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le int concurrentDirs = 0; BOOL done_header = FALSE; - static const WCHAR fmtDir[] = {'%','1','!','1','0','s','!',' ',' ','%','2','!','8','s','!',' ',' ', - '<','D','I','R','>',' ',' ',' ',' ',' ',' ',' ',' ',' ','\0'}; - static const WCHAR fmtFile[] = {'%','1','!','1','0','s','!',' ',' ','%','2','!','8','s','!',' ',' ', - ' ',' ','%','3','!','1','0','s','!',' ',' ','\0'}; static const WCHAR fmt2[] = {'%','1','!','-','1','3','s','!','\0'}; static const WCHAR fmt3[] = {'%','1','!','-','2','3','s','!','\0'}; static const WCHAR fmt4[] = {'%','1','\0'}; @@ -317,9 +312,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (!bare) { if (level != 0 && (entry_count > 0)) WCMD_output_asis (newlineW); if (!recurse || ((entry_count > 0) && done_header==FALSE)) { - static const WCHAR headerW[] = {'D','i','r','e','c','t','o','r','y',' ','o','f', - ' ','%','1','\n','\n','\0'}; - WCMD_output (headerW, real_path); + WCMD_output (L"Directory of %1\n\n", real_path); done_header = TRUE; } } @@ -388,13 +381,11 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le tmp_width = cur_width; if (fd[i].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - static const WCHAR fmt[] = {'[','%','1',']','\0'}; - WCMD_output (fmt, fd[i].cFileName); + WCMD_output (L"[%1]", fd[i].cFileName); dir_count++; tmp_width = tmp_width + lstrlenW(fd[i].cFileName) + 2; } else { - static const WCHAR fmt[] = {'%','1','\0'}; - WCMD_output (fmt, fd[i].cFileName); + WCMD_output (L"%1", fd[i].cFileName); tmp_width = tmp_width + lstrlenW(fd[i].cFileName) ; file_count++; file_size.u.LowPart = fd[i].nFileSizeLow; @@ -406,15 +397,14 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if ((cur_width + widest) > max_width) { cur_width = 0; } else { - static const WCHAR padfmt[] = {'%','1','!','*','s','!','\0'}; - WCMD_output(padfmt, cur_width - tmp_width, nullW); + WCMD_output(L"%1!*s!", cur_width - tmp_width, nullW); } } else if (fd[i].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { dir_count++; if (!bare) { - WCMD_output (fmtDir, datestring, timestring); + WCMD_output (L"%1!10s! %2!8s! <DIR> ", datestring, timestring); if (shortname) WCMD_output (fmt2, fd[i].cAlternateFileName); if (usernames) WCMD_output (fmt3, username); WCMD_output(fmt4,fd[i].cFileName); @@ -433,7 +423,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le file_size.u.HighPart = fd[i].nFileSizeHigh; byte_count.QuadPart += file_size.QuadPart; if (!bare) { - WCMD_output (fmtFile, datestring, timestring, + WCMD_output (L"%1!10s! %2!8s! %3!10s! ", datestring, timestring, WCMD_filesize64(file_size.QuadPart)); if (shortname) WCMD_output (fmt2, fd[i].cAlternateFileName); if (usernames) WCMD_output (fmt3, username); @@ -449,14 +439,10 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (!bare) { if (file_count == 1) { - static const WCHAR fmt[] = {' ',' ',' ',' ',' ',' ',' ','1',' ','f','i','l','e',' ', - '%','1','!','2','5','s','!',' ','b','y','t','e','s','\n','\0'}; - WCMD_output (fmt, WCMD_filesize64 (byte_count.QuadPart)); + WCMD_output (L" 1 file %1!25s! bytes\n", WCMD_filesize64 (byte_count.QuadPart)); } else { - static const WCHAR fmt[] = {'%','1','!','8','d','!',' ','f','i','l','e','s',' ','%','2','!','2','4','s','!', - ' ','b','y','t','e','s','\n','\0'}; - WCMD_output (fmt, file_count, WCMD_filesize64 (byte_count.QuadPart)); + WCMD_output (L"%1!8d! files %2!24s! bytes\n", file_count, WCMD_filesize64 (byte_count.QuadPart)); } } byte_total = byte_total + byte_count.QuadPart; @@ -465,13 +451,9 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (!bare && !recurse) { if (dir_count == 1) { - static const WCHAR fmt[] = {'%','1','!','8','d','!',' ','d','i','r','e','c','t','o','r','y', - ' ',' ',' ',' ',' ',' ',' ',' ',' ','\0'}; - WCMD_output (fmt, 1); + WCMD_output (L"%1!8d! directory ", 1); } else { - static const WCHAR fmt[] = {'%','1','!','8','d','!',' ','d','i','r','e','c','t','o','r','i', - 'e','s','\0'}; - WCMD_output (fmt, dir_count); + WCMD_output (L"%1!8d! directories", dir_count); } } } @@ -555,7 +537,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le static void WCMD_dir_trailer(WCHAR drive) { ULARGE_INTEGER avail, total, freebytes; DWORD status; - WCHAR driveName[] = {'c',':','\\','\0'}; + WCHAR driveName[] = L"c:\\"; driveName[0] = drive; status = GetDiskFreeSpaceExW(driveName, &avail, &total, &freebytes); @@ -564,18 +546,10 @@ static void WCMD_dir_trailer(WCHAR drive) { if (errorlevel==0 && !bare) { if (recurse) { - static const WCHAR fmt1[] = {'\n',' ',' ',' ',' ',' ','T','o','t','a','l',' ','f','i','l','e','s', - ' ','l','i','s','t','e','d',':','\n','%','1','!','8','d','!',' ','f','i','l','e', - 's','%','2','!','2','5','s','!',' ','b','y','t','e','s','\n','\0'}; - static const WCHAR fmt2[] = {'%','1','!','8','d','!',' ','d','i','r','e','c','t','o','r','i','e','s',' ','%', - '2','!','1','8','s','!',' ','b','y','t','e','s',' ','f','r','e','e','\n','\n', - '\0'}; - WCMD_output (fmt1, file_total, WCMD_filesize64 (byte_total)); - WCMD_output (fmt2, dir_total, WCMD_filesize64 (freebytes.QuadPart)); + WCMD_output (L"\n Total files listed:\n%1!8d! files%2!25s! bytes\n", file_total, WCMD_filesize64 (byte_total)); + WCMD_output (L"%1!8d! directories %2!18s! bytes free\n\n", dir_total, WCMD_filesize64 (freebytes.QuadPart)); } else { - static const WCHAR fmt[] = {' ','%','1','!','1','8','s','!',' ','b','y','t','e','s',' ','f','r','e','e', - '\n','\n','\0'}; - WCMD_output (fmt, WCMD_filesize64 (freebytes.QuadPart)); + WCMD_output (L" %1!18s! bytes free\n\n", WCMD_filesize64 (freebytes.QuadPart)); } } } @@ -605,12 +579,11 @@ void WCMD_directory (WCHAR *args) WCHAR dir[MAX_PATH]; WCHAR fname[MAX_PATH]; WCHAR ext[MAX_PATH]; - static const WCHAR dircmdW[] = {'D','I','R','C','M','D','\0'}; errorlevel = 0; /* Prefill quals with (uppercased) DIRCMD env var */ - if (GetEnvironmentVariableW(dircmdW, string, ARRAY_SIZE(string))) { + if (GetEnvironmentVariableW(L"DIRCMD", string, ARRAY_SIZE(string))) { p = string; while ( (*p = toupper(*p)) ) ++p; lstrcatW(string,quals); @@ -804,11 +777,9 @@ void WCMD_directory (WCHAR *args) lstrcpyW(fullname, thisArg); } else if (thisArg[1] == ':' && thisArg[2] != '\\') { WCHAR envvar[4]; - static const WCHAR envFmt[] = {'=','%','c',':','\0'}; - wsprintfW(envvar, envFmt, thisArg[0]); + wsprintfW(envvar, L"=%c:", thisArg[0]); if (!GetEnvironmentVariableW(envvar, fullname, MAX_PATH)) { - static const WCHAR noEnvFmt[] = {'%','c',':','\0'}; - wsprintfW(fullname, noEnvFmt, thisArg[0]); + wsprintfW(fullname, L"%c:", thisArg[0]); } lstrcatW(fullname, slashW); lstrcatW(fullname, &thisArg[2]); @@ -906,8 +877,7 @@ void WCMD_directory (WCHAR *args) } } } else { - static const WCHAR newLine2[] = {'\n','\n','\0'}; - if (!bare) WCMD_output_asis (newLine2); + if (!bare) WCMD_output_asis (L"\n\n"); } /* Clear any errors from previous invocations, and process it */

1 0

Liam Middlebrook : winevulkan: Generate typedefs for aliased structs.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: bdeae71bc129ac83c44753672d110b06a480c93c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdeae71bc129ac83c4475367… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Tue Mar 24 14:14:43 2020 -0700 winevulkan: Generate typedefs for aliased structs. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: James Jones <jajones(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 21 +++++- dlls/winevulkan/vulkan_thunks.h | 80 +++++++++++++++++++++++ include/wine/vulkan.h | 137 +++++++++++++++++++++++++++++++++------- 3 files changed, 214 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdeae71bc129ac83c447…

1 0

Dmitry Timoshkov : adsldp: Turn FIXME into a TRACE for IADsOpenDSObject::OpenDSObject().
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 0662aaaddc0679abe032ca8ea9f48c34cba48179 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0662aaaddc0679abe032ca8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 25 11:17:24 2020 +0800 adsldp: Turn FIXME into a TRACE for IADsOpenDSObject::OpenDSObject(). It's in a good enough state already. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 03f7571afd..7ff1aa09b4 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -924,7 +924,7 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B HRESULT hr; ULONG err; - FIXME("%p,%s,%s,%p,%08x,%p: semi-stub\n", iface, debugstr_w(path), debugstr_w(user), password, flags, obj); + TRACE("%p,%s,%s,%p,%08x,%p\n", iface, debugstr_w(path), debugstr_w(user), password, flags, obj); hr = parse_path(path, &host, &port, &object); if (hr != S_OK) return hr;

1 0

Dmitry Timoshkov : adsldp: Forward IADsOpenDSObject::AddRef/Release to base object.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 2512bf2c1def78edafaf4bbd8448bfb97f44b1dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2512bf2c1def78edafaf4bbd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 25 11:17:35 2020 +0800 adsldp: Forward IADsOpenDSObject::AddRef/Release to base object. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 7ff1aa09b4..c49f9ef70b 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -806,21 +806,13 @@ static HRESULT WINAPI openobj_QueryInterface(IADsOpenDSObject *iface, REFIID rii static ULONG WINAPI openobj_AddRef(IADsOpenDSObject *iface) { LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); - return InterlockedIncrement(&ldap->ref); + return IADs_AddRef(&ldap->IADs_iface); } static ULONG WINAPI openobj_Release(IADsOpenDSObject *iface) { LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); - LONG ref = InterlockedDecrement(&ldap->ref); - - if (!ref) - { - TRACE("destroying %p\n", iface); - HeapFree(GetProcessHeap(), 0, ldap); - } - - return ref; + return IADs_Release(&ldap->IADs_iface); } static HRESULT WINAPI openobj_GetTypeInfoCount(IADsOpenDSObject *iface, UINT *count)

1 0

Dmitry Timoshkov : adsldp: Add IDirectorySearch stubs.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 66897b455ca9d3f4bdbf8afcb847f91b2578eca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66897b455ca9d3f4bdbf8afc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 25 11:17:42 2020 +0800 adsldp: Add IDirectorySearch stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/iads.idl | 4 +- 2 files changed, 124 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c49f9ef70b..caf404c3c6 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -381,6 +381,7 @@ typedef struct { IADs IADs_iface; IADsOpenDSObject IADsOpenDSObject_iface; + IDirectorySearch IDirectorySearch_iface; LONG ref; LDAP *ld; BSTR host; @@ -419,6 +420,13 @@ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj return S_OK; } + if (IsEqualGUID(riid, &IID_IDirectorySearch)) + { + IADs_AddRef(iface); + *obj = &ldap->IDirectorySearch_iface; + return S_OK; + } + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1046,6 +1054,120 @@ static const IADsOpenDSObjectVtbl IADsOpenDSObject_vtbl = openobj_OpenDSObject }; +static inline LDAP_namespace *impl_from_IDirectorySearch(IDirectorySearch *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IDirectorySearch_iface); +} + +static HRESULT WINAPI search_QueryInterface(IDirectorySearch *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IDirectorySearch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IDirectorySearch_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI search_AddRef(IDirectorySearch *iface) +{ + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + return IADs_AddRef(&ldap->IADs_iface); +} + +static ULONG WINAPI search_Release(IDirectorySearch *iface) +{ + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + return IADs_Release(&ldap->IADs_iface); +} + +static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_SEARCHPREF_INFO prefs, DWORD count) +{ + FIXME("%p,%p,%u: stub\n", iface, prefs, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filter, LPWSTR *names, + DWORD count, PADS_SEARCH_HANDLE res) +{ + FIXME("%p,%s,%p,%u,%p: stub\n", iface, debugstr_w(filter), names, count, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_AbandonSearch(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetFirstRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetPreviousRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, LPWSTR *names) +{ + FIXME("%p,%p,%p: stub\n", iface, res, names); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, + LPWSTR name, PADS_SEARCH_COLUMN col) +{ + FIXME("%p,%p,%s,%p: stub\n", iface, res, debugstr_w(name), col); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COLUMN col) +{ + FIXME("%p,%p: stub\n", iface, col); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static const IDirectorySearchVtbl IDirectorySearch_vtbl = +{ + search_QueryInterface, + search_AddRef, + search_Release, + search_SetSearchPreference, + search_ExecuteSearch, + search_AbandonSearch, + search_GetFirstRow, + search_GetNextRow, + search_GetPreviousRow, + search_GetNextColumnName, + search_GetColumn, + search_FreeColumn, + search_CloseSearchHandle +}; + static HRESULT LDAPNamespace_create(REFIID riid, void **obj) { LDAP_namespace *ldap; @@ -1056,6 +1178,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->IADs_iface.lpVtbl = &IADs_vtbl; ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; + ldap->IDirectorySearch_iface.lpVtbl = &IDirectorySearch_vtbl; ldap->ref = 1; ldap->ld = NULL; ldap->host = NULL; diff --git a/include/iads.idl b/include/iads.idl index 8553a03d8c..fdee17859d 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -99,8 +99,6 @@ typedef enum ADS_SEARCHPREF_EXTENDED_DN } ADS_SEARCHPREF_ENUM; -typedef ADS_SEARCHPREF_ENUM *PADS_SEARCHPREF_INFO; - typedef enum { ADS_STATUS_S_OK, @@ -328,7 +326,7 @@ typedef struct ads_searchpref_info ADS_SEARCHPREF dwSearchPref; ADSVALUE vValue; ADS_STATUS dwStatus; -} ADS_SEARCHPREF_INFO; +} ADS_SEARCHPREF_INFO, *PADS_SEARCHPREF_INFO; typedef struct ads_search_column {

1 0