wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Paul Gofman : ntdll: Allocate DDAG node for module.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 41c7652bbefd8099a47fdc110d24c6c91861cd93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41c7652bbefd8099a47fdc11… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 2 13:26:40 2021 +0300 ntdll: Allocate DDAG node for module. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 6 +++--- dlls/ntdll/loader.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index fd369ff33e9..7c4b690fb39 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1358,7 +1358,7 @@ static void test_ddag_node(void) if (!(node = mod->DdagNode)) { - skip( "DdagNode is NULL, skipping tests.\n" ); + win_skip( "DdagNode is NULL, skipping tests.\n" ); return; } @@ -1376,11 +1376,11 @@ static void test_ddag_node(void) ok( !node->IncomingDependencies.Tail, "Expected empty incoming dependencies list.\n" ); /* node->Dependencies.Tail is NULL on Windows 10 1507-1607 32 bit test, maybe due to broken structure layout. */ - ok( !!node->Dependencies.Tail || broken( sizeof(void *) == 4 && !node->Dependencies.Tail), + todo_wine ok( !!node->Dependencies.Tail || broken( sizeof(void *) == 4 && !node->Dependencies.Tail ), "Expected nonempty dependencies list.\n" ); if (!node->Dependencies.Tail) { - win_skip( "Empty dependencies list.\n" ); + skip( "Empty dependencies list.\n" ); return; } ok( node->LoadCount == -1, "Got unexpected LoadCount %d.\n", node->LoadCount ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index dd41d6b66d2..ebb0f4250f9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1232,6 +1232,16 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name RtlFreeHeap( GetProcessHeap(), 0, wm ); return NULL; } + + if (!(wm->ldr.DdagNode = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wm->ldr.DdagNode) ))) + { + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + RtlFreeHeap( GetProcessHeap(), 0, wm ); + return NULL; + } + InitializeListHead(&wm->ldr.DdagNode->Modules); + InsertTailList(&wm->ldr.DdagNode->Modules, &wm->ldr.NodeModuleLink); + memcpy( buffer, nt_name->Buffer + 4 /* \??\ prefix */, nt_name->Length - 4 * sizeof(WCHAR) ); buffer[nt_name->Length/sizeof(WCHAR) - 4] = 0; if ((p = wcsrchr( buffer, '\\' ))) p++; @@ -3518,6 +3528,10 @@ static void free_modref( WINE_MODREF *wm ) if (wm->ldr.InInitializationOrderLinks.Flink) RemoveEntryList(&wm->ldr.InInitializationOrderLinks); + RemoveEntryList(&wm->ldr.NodeModuleLink); + if (IsListEmpty(&wm->ldr.DdagNode->Modules)) + RtlFreeHeap( GetProcessHeap(), 0, wm->ldr.DdagNode ); + TRACE(" unloading %s\n", debugstr_w(wm->ldr.FullDllName.Buffer)); if (!TRACE_ON(module)) TRACE_(loaddll)("Unloaded module %s : %s\n",

1 0

Alexandre Julliard : include: Don't include wine/port.h in Unix libraries.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: ef6e33f89f94e1fc109bb6c415d7c80f141619d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef6e33f89f94e1fc109bb6c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 10:43:50 2021 +0100 include: Don't include wine/port.h in Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 3 ++- dlls/dwrite/freetype.c | 4 +++- dlls/kerberos/unixlib.c | 5 ++++- dlls/netapi32/unixlib.c | 7 ++----- dlls/odbc32/unixlib.c | 3 ++- dlls/secur32/schannel_gnutls.c | 3 ++- dlls/win32u/dibdrv/opengl.c | 4 +++- dlls/win32u/freetype.c | 7 +++---- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 8 ++++---- include/wine/port.h | 4 ++++ 11 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 863b47f50eb..d7b4499c692 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -23,13 +23,14 @@ #endif #include "config.h" -#include "wine/port.h" #ifdef HAVE_GNUTLS_CIPHER_INIT #include <stdarg.h> #include <stdlib.h> #include <assert.h> +#include <sys/types.h> +#include <dlfcn.h> #include <gnutls/gnutls.h> #include <gnutls/crypto.h> #include <gnutls/abstract.h> diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index ca29b0d97bd..1ece99e08c9 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -23,7 +23,9 @@ #endif #include "config.h" -#include "wine/port.h" + +#include <sys/types.h> +#include <dlfcn.h> #ifdef HAVE_FT2BUILD_H #include <ft2build.h> diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index cceb99b2b36..a735a1c6a47 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -26,10 +26,13 @@ #endif #include "config.h" + #if defined(SONAME_LIBKRB5) && defined(SONAME_LIBGSSAPI_KRB5) -#include "wine/port.h" #include <stdarg.h> +#include <sys/types.h> +#include <dlfcn.h> + #ifdef HAVE_KRB5_KRB5_H # include <krb5/krb5.h> #endif diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 0c86b619c99..4e77808cb86 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -24,7 +24,6 @@ #endif #include "config.h" -#include "wine/port.h" #ifdef SONAME_LIBNETAPI @@ -32,12 +31,10 @@ #include <stdlib.h> #include <fcntl.h> #include <errno.h> -#ifdef HAVE_SYS_WAIT_H +#include <sys/types.h> #include <sys/wait.h> -#endif -#ifdef HAVE_UNISTD_H #include <unistd.h> -#endif +#include <dlfcn.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/odbc32/unixlib.c b/dlls/odbc32/unixlib.c index 4bc8708f486..8458406d8c0 100644 --- a/dlls/odbc32/unixlib.c +++ b/dlls/odbc32/unixlib.c @@ -29,10 +29,11 @@ #endif #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdlib.h> +#include <sys/types.h> +#include <dlfcn.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index b817a37c4a4..5f7ea3842a0 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -24,12 +24,13 @@ #endif #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <errno.h> +#include <sys/types.h> +#include <dlfcn.h> #ifdef SONAME_LIBGNUTLS #include <gnutls/gnutls.h> #include <gnutls/crypto.h> diff --git a/dlls/win32u/dibdrv/opengl.c b/dlls/win32u/dibdrv/opengl.c index 9504e8efd25..5d3ee471497 100644 --- a/dlls/win32u/dibdrv/opengl.c +++ b/dlls/win32u/dibdrv/opengl.c @@ -23,7 +23,9 @@ #endif #include "config.h" -#include "wine/port.h" + +#include <sys/types.h> +#include <dlfcn.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 70415d8a157..3894478a846 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -26,14 +26,13 @@ #endif #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdlib.h> +#include <sys/types.h> +#include <sys/stat.h> #include <fcntl.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <dlfcn.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 4412a4bf6dd..eef882b52e8 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -22,9 +22,9 @@ #endif #include "config.h" -#include "wine/port.h" #include <stdarg.h> +#include <sys/types.h> #if defined(HAVE_IOKIT_HID_IOHIDLIB_H) #define DWORD UInt32 diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index d172d5382fd..c01648ce67e 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -23,14 +23,14 @@ #endif #include "config.h" -#include "wine/port.h" + #include <errno.h> #include <fcntl.h> #include <stdarg.h> #include <stdlib.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <sys/types.h> +#include <dlfcn.h> #ifdef HAVE_SDL_H # include <SDL.h> #endif diff --git a/include/wine/port.h b/include/wine/port.h index 694032a33bc..0405b8d63ad 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -29,6 +29,10 @@ # error You must include port.h before all other headers #endif +#ifdef WINE_UNIX_LIB +# error port.h should not be used in Unix libraries +#endif + #include <sys/types.h>

1 0

Alexandre Julliard : include: Don't include stdlib.h in wine/port.h.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: ef9a0f3bc35d24db0d097aba838f6b8fd6e507f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef9a0f3bc35d24db0d097aba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 10:43:13 2021 +0100 include: Don't include stdlib.h in wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 1 + dlls/mountmgr.sys/device.c | 1 + dlls/mountmgr.sys/mountmgr.c | 1 + dlls/netapi32/unixlib.c | 1 + dlls/secur32/schannel_gnutls.c | 1 + dlls/winevulkan/make_vulkan | 5 +++-- dlls/winevulkan/vulkan_thunks.c | 3 ++- include/wine/port.h | 1 - 8 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index a015d85f85d..863b47f50eb 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -28,6 +28,7 @@ #ifdef HAVE_GNUTLS_CIPHER_INIT #include <stdarg.h> +#include <stdlib.h> #include <assert.h> #include <gnutls/gnutls.h> #include <gnutls/crypto.h> diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index aa6db175e69..23134787ba0 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -25,6 +25,7 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include <fcntl.h> #include <unistd.h> #include <sys/time.h> diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 27f642df7e8..2dff533f221 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -31,6 +31,7 @@ #endif #include <stdarg.h> +#include <stdlib.h> #include <unistd.h> #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 565327ba4b1..0c86b619c99 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -29,6 +29,7 @@ #ifdef SONAME_LIBNETAPI #include <stdarg.h> +#include <stdlib.h> #include <fcntl.h> #include <errno.h> #ifdef HAVE_SYS_WAIT_H diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 4d8109721ce..b817a37c4a4 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -28,6 +28,7 @@ #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include <errno.h> #ifdef SONAME_LIBGNUTLS #include <gnutls/gnutls.h> diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e84442d7a79..f88f15b49dd 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2673,8 +2673,9 @@ class VkGenerator(object): f.write("#pragma makedep unix\n") f.write("#endif\n\n") - f.write("#include \"config.h\"\n") - f.write("#include \"wine/port.h\"\n\n") + f.write("#include \"config.h\"\n\n") + + f.write("#include <stdlib.h>\n\n") f.write("#include \"vulkan_private.h\"\n\n") diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 97dbc4664ec..eeda463d7a7 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -14,7 +14,8 @@ #endif #include "config.h" -#include "wine/port.h" + +#include <stdlib.h> #include "vulkan_private.h" diff --git a/include/wine/port.h b/include/wine/port.h index 8520fbc05b1..694032a33bc 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -30,7 +30,6 @@ #endif #include <sys/types.h> -#include <stdlib.h> /****************************************************************

1 0

Alexandre Julliard : include: Don't include string.h in wine/port.h.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: cf04fe762cce33494bf29410dd68efdae8161124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf04fe762cce33494bf29410… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 10:43:07 2021 +0100 include: Don't include string.h in wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/wine/port.h b/include/wine/port.h index bc71725ed4e..8520fbc05b1 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -30,7 +30,6 @@ #endif #include <sys/types.h> -#include <string.h> #include <stdlib.h>

1 0

Alexandre Julliard : include: Don't include unistd.h in wine/port.h.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: efe46a0483084abd570bdce15ea044e168d10441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efe46a0483084abd570bdce1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 10:42:59 2021 +0100 include: Don't include unistd.h in wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/freetype.c | 1 + dlls/wineandroid.drv/device.c | 1 + include/wine/port.h | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 6e573b23cdf..70415d8a157 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -43,6 +43,7 @@ #endif #include <stdio.h> #include <assert.h> +#include <unistd.h> #ifdef HAVE_CARBON_CARBON_H #define LoadResource __carbon_LoadResource diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 4a16e6836ed..6ddb4b741eb 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <stdarg.h> #include <sys/ioctl.h> +#include <unistd.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT diff --git a/include/wine/port.h b/include/wine/port.h index 0e9911af9ad..bc71725ed4e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -32,9 +32,6 @@ #include <sys/types.h> #include <string.h> #include <stdlib.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif /****************************************************************

1 0

Alexandre Julliard : include: Don't define __in and __out.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 1c9b843ecf821d3caf43668c43bf0280c793b25d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9b843ecf821d3caf43668c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 10:42:07 2021 +0100 include: Don't define __in and __out. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51919 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 4 ++-- libs/jxr/jxrgluelib/JXRMeta.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/sal.h b/include/sal.h index 680f97f9250..f11e744aa51 100644 --- a/include/sal.h +++ b/include/sal.h @@ -344,7 +344,7 @@ #define __ecount(size) #define __ecount_opt(size) -#define __in +/* #define __in */ /* conflicts with system headers */ #define __in_bcount(size) #define __in_bcount_nz(size) #define __in_bcount_nz_opt(size) @@ -390,7 +390,7 @@ #define __inout_z #define __inout_z_opt -#define __out +/* #define __out */ /* conflicts with system headers */ #define __out_bcount(size) #define __out_bcount_full(size) #define __out_bcount_full_opt(size) diff --git a/libs/jxr/jxrgluelib/JXRMeta.h b/libs/jxr/jxrgluelib/JXRMeta.h index 53215041d70..81b12ea063c 100644 --- a/libs/jxr/jxrgluelib/JXRMeta.h +++ b/libs/jxr/jxrgluelib/JXRMeta.h @@ -107,8 +107,8 @@ #ifdef WIN32 -#define __in_win __in -#define __out_win __out +#define __in_win +#define __out_win #endif

1 0

Alexandre Julliard : qcap: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 62e2d7a99b089b1ce302a348103178e64dee4342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62e2d7a99b089b1ce302a348… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 18:38:11 2021 +0100 qcap: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 1 + dlls/qcap/qcap_private.h | 123 ++++++++++++++++++++++++++++------ dlls/qcap/v4l.c | 168 +++++++++++++++++++++++++++-------------------- dlls/qcap/vfwcapture.c | 73 ++++++++++++++------ 4 files changed, 255 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=62e2d7a99b089b1ce302…

1 0

Alistair Leslie-Hughes : msdasql/tests: Add MSDASQL_ENUMERATOR tests.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 626f85f5f69aaa0318362f4e52addbaa75326db0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=626f85f5f69aaa0318362f4e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 3 16:37:12 2021 +1100 msdasql/tests: Add MSDASQL_ENUMERATOR tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/tests/provider.c | 89 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 8b076ed4479..6cf95e02a80 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -461,6 +461,93 @@ static void cleanup_database(void) DeleteFileA(mdbpath); } +static void test_enumeration(void) +{ + ISourcesRowset *source; + IRowset *rowset, *rowset2; + IColumnsInfo *columninfo; + IAccessor *accessor; + DBBINDING bindings = { 1, 0, 0, 512, NULL, NULL, NULL, DBPART_VALUE | DBPART_STATUS, DBMEMOWNER_CLIENTOWNED, DBPARAMIO_NOTPARAM, 514, 0, DBTYPE_WSTR, 0, 0 }; + HACCESSOR hacc; + HRESULT hr; + + DBCOLUMNINFO colinfo_data[] = + { + { NULL, NULL, 0, DBCOLUMNFLAGS_ISFIXEDLENGTH | DBCOLUMNFLAGS_ISBOOKMARK, 4, DBTYPE_UI4, 10, 255 }, + { (WCHAR*)L"SOURCES_NAME", NULL, 1, DBCOLUMNFLAGS_MAYBENULL | DBCOLUMNFLAGS_WRITEUNKNOWN, 128, DBTYPE_WSTR, 255, 255 }, + { (WCHAR*)L"SOURCES_PARSENAME", NULL, 2, DBCOLUMNFLAGS_MAYBENULL | DBCOLUMNFLAGS_WRITEUNKNOWN, 128, DBTYPE_WSTR, 255, 255 }, + { (WCHAR*)L"SOURCES_DESCRIPTION", NULL, 3, DBCOLUMNFLAGS_MAYBENULL | DBCOLUMNFLAGS_WRITEUNKNOWN, 128, DBTYPE_WSTR, 255, 255 }, + { (WCHAR*)L"SOURCES_TYPE", NULL, 4, DBCOLUMNFLAGS_ISFIXEDLENGTH | DBCOLUMNFLAGS_MAYBENULL | DBCOLUMNFLAGS_WRITEUNKNOWN, 2, DBTYPE_UI2, 5, 255 }, + { (WCHAR*)L"SOURCES_ISPARENT", NULL, 5, DBCOLUMNFLAGS_ISFIXEDLENGTH | DBCOLUMNFLAGS_MAYBENULL | DBCOLUMNFLAGS_WRITEUNKNOWN, 2, DBTYPE_BOOL, 255, 255 } + }; + + hr = CoCreateInstance( &CLSID_MSDASQL_ENUMERATOR, NULL, CLSCTX_INPROC_SERVER, &IID_ISourcesRowset, + (void **)&source ); + if ( FAILED(hr)) + { + skip("Failed create Enumerator object\n"); + return; + } + + hr = ISourcesRowset_GetSourcesRowset(source, NULL, &IID_IRowset, 0, NULL, (IUnknown**)&rowset); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISourcesRowset_GetSourcesRowset(source, NULL, &IID_IRowset, 0, NULL, (IUnknown**)&rowset2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(rowset != rowset2, "same pointer\n"); + IRowset_Release(rowset2); + + hr = IRowset_QueryInterface(rowset, &IID_IColumnsInfo, (void**)&columninfo); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + DBORDINAL columns; + DBCOLUMNINFO *dbcolumninfo; + OLECHAR *buffer; + int i; + + hr = IColumnsInfo_GetColumnInfo(columninfo, &columns, &dbcolumninfo, &buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(columns == 6, "got %lu\n", columns); + + for( i = 0; i < columns; i++ ) + { + if (!dbcolumninfo[i].pwszName || !colinfo_data[i].pwszName) + ok (dbcolumninfo[i].pwszName == colinfo_data[i].pwszName, "got %p/%p", dbcolumninfo[i].pwszName, colinfo_data[i].pwszName); + else + ok ( !wcscmp(dbcolumninfo[i].pwszName, colinfo_data[i].pwszName), "got %p/%p", + debugstr_w(dbcolumninfo[i].pwszName), debugstr_w(colinfo_data[i].pwszName)); + + ok (dbcolumninfo[i].pTypeInfo == colinfo_data[i].pTypeInfo, "got %p/%p", dbcolumninfo[i].pTypeInfo, colinfo_data[i].pTypeInfo); + ok (dbcolumninfo[i].iOrdinal == colinfo_data[i].iOrdinal, "got %ld/%ld", dbcolumninfo[i].iOrdinal, colinfo_data[i].iOrdinal); + ok (dbcolumninfo[i].dwFlags == colinfo_data[i].dwFlags, "got 0x%08x/0x%0x8", dbcolumninfo[i].dwFlags, colinfo_data[i].dwFlags); + ok (dbcolumninfo[i].ulColumnSize == colinfo_data[i].ulColumnSize, "got %lu/%lu", dbcolumninfo[i].ulColumnSize, colinfo_data[i].ulColumnSize); + ok (dbcolumninfo[i].wType == colinfo_data[i].wType, "got %d/%d", dbcolumninfo[i].wType, colinfo_data[i].wType); + ok (dbcolumninfo[i].bPrecision == colinfo_data[i].bPrecision, "got %d/%d", dbcolumninfo[i].bPrecision, colinfo_data[i].bPrecision); + ok (dbcolumninfo[i].bScale == colinfo_data[i].bScale, "got %d/%d", dbcolumninfo[i].bScale, colinfo_data[i].bScale); + } + + CoTaskMemFree(buffer); + IColumnsInfo_Release(columninfo); + } + + hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void**)&accessor); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* Request only SOURCES_NAME column */ + hr = IAccessor_CreateAccessor(accessor, DBACCESSOR_ROWDATA, 1, &bindings, 0, &hacc, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hacc != 0, "got %Ix\n", hacc); + + hr = IAccessor_ReleaseAccessor(accessor, hacc, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IAccessor_Release(accessor); + + IRowset_Release(rowset); + ISourcesRowset_Release(source); +} + START_TEST(provider) { CoInitialize(0); @@ -471,6 +558,8 @@ START_TEST(provider) test_Properties(); test_sessions(); + test_enumeration(); + cleanup_database(); CoUninitialize();

1 0

Alistair Leslie-Hughes : msdasql: Support IAccessor in IRowset for Enumeration.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: 9e76b504e54e80ffee72a033b8dfd9e001b04cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e76b504e54e80ffee72a033… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 3 16:37:11 2021 +1100 msdasql: Support IAccessor in IRowset for Enumeration. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 81 +++++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/database.c | 2 +- 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 7402b505270..b8d68287e6a 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -609,6 +609,7 @@ static ULONG WINAPI msdasql_enum_Release(ISourcesRowset *iface) struct msdasql_enum_rowset { IRowset IRowset_iface; + IAccessor IAccessor_iface; LONG ref; }; @@ -617,6 +618,11 @@ static inline struct msdasql_enum_rowset *msdasql_rs_from_IRowset(IRowset *iface return CONTAINING_RECORD(iface, struct msdasql_enum_rowset, IRowset_iface); } +static inline struct msdasql_enum_rowset *msdasql_enum_from_IAccessor ( IAccessor *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_enum_rowset, IAccessor_iface ); +} + static HRESULT WINAPI enum_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); @@ -629,6 +635,10 @@ static HRESULT WINAPI enum_rowset_QueryInterface(IRowset *iface, REFIID riid, v { *ppv = &rowset->IRowset_iface; } + else if(IsEqualGUID(&IID_IAccessor, riid)) + { + *ppv = &rowset->IAccessor_iface; + } if(*ppv) { @@ -729,6 +739,76 @@ static const struct IRowsetVtbl enum_rowset_vtbl = enum_rowset_RestartPosition }; +static HRESULT WINAPI enum_rs_accessor_QueryInterface(IAccessor *iface, REFIID riid, void **out) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI enum_rs_accessor_AddRef(IAccessor *iface) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI enum_rs_accessor_Release(IAccessor *iface) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI enum_rs_accessor_AddRefAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + FIXME("%p, %lu, %p\n", rowset, accessor, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_rs_accessor_CreateAccessor(IAccessor *iface, DBACCESSORFLAGS flags, + DBCOUNTITEM count, const DBBINDING bindings[], DBLENGTH row_size, HACCESSOR *accessor, + DBBINDSTATUS status[]) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + + FIXME("%p 0x%08x, %lu, %p, %lu, %p, %p\n", rowset, flags, count, bindings, row_size, accessor, status); + + if (accessor) + *accessor = 0xdeadbeef; + + return S_OK; +} + +static HRESULT WINAPI enum_rs_accessor_GetBindings(IAccessor *iface, HACCESSOR accessor, + DBACCESSORFLAGS *flags, DBCOUNTITEM *count, DBBINDING **bindings) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + FIXME("%p %lu, %p, %p, %p\n", rowset, accessor, flags, count, bindings); + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_rs_accessor_ReleaseAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) +{ + struct msdasql_enum_rowset *rowset = msdasql_enum_from_IAccessor( iface ); + + FIXME("%p, %lu, %p\n", rowset, accessor, count); + + if (count) + *count = 0; + + return S_OK; +} + +struct IAccessorVtbl enum_accessor_vtbl = +{ + enum_rs_accessor_QueryInterface, + enum_rs_accessor_AddRef, + enum_rs_accessor_Release, + enum_rs_accessor_AddRefAccessor, + enum_rs_accessor_CreateAccessor, + enum_rs_accessor_GetBindings, + enum_rs_accessor_ReleaseAccessor +}; + static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnknown *outer, REFIID riid, ULONG sets, DBPROPSET properties[], IUnknown **rowset) { @@ -740,6 +820,7 @@ static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnkn enum_rs = malloc(sizeof(*enum_rs)); enum_rs->IRowset_iface.lpVtbl = &enum_rowset_vtbl; + enum_rs->IAccessor_iface.lpVtbl = &enum_accessor_vtbl; enum_rs->ref = 1; hr = IRowset_QueryInterface(&enum_rs->IRowset_iface, riid, (void**)rowset); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 7e298fcb129..421f4258afd 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -1080,7 +1080,7 @@ static void test_odbc_enumerator(void) IRowsetInfo *info; hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void **)&accessor); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); if (hr == S_OK) IAccessor_Release(accessor);

1 0

Alistair Leslie-Hughes : msdasql: Implement ISourcesRowset GetSourcesRowset for enumeration.
by Alexandre Julliard 03 Nov '21

03 Nov '21

Module: wine Branch: master Commit: cf82bc541773bb22b120f42f852c8863a222fbac URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf82bc541773bb22b120f42f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 3 16:37:10 2021 +1100 msdasql: Implement ISourcesRowset GetSourcesRowset for enumeration. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 137 +++++++++++++++++++++++++++++++++++++++++- dlls/oledb32/tests/database.c | 6 +- 2 files changed, 138 insertions(+), 5 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index ff16413004e..7402b505270 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -26,6 +26,7 @@ #include "oledb.h" #include "rpcproxy.h" #include "wine/debug.h" +#include "oledberr.h" #include "initguid.h" #include "msdasql.h" @@ -605,13 +606,145 @@ static ULONG WINAPI msdasql_enum_Release(ISourcesRowset *iface) return ref; } +struct msdasql_enum_rowset +{ + IRowset IRowset_iface; + LONG ref; +}; + +static inline struct msdasql_enum_rowset *msdasql_rs_from_IRowset(IRowset *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql_enum_rowset, IRowset_iface); +} + +static HRESULT WINAPI enum_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + TRACE( "%p, %s, %p\n", rowset, debugstr_guid(riid), ppv ); + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IRowset, riid)) + { + *ppv = &rowset->IRowset_iface; + } + + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI enum_rowset_AddRef(IRowset *iface) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + LONG refs = InterlockedIncrement( &rowset->ref ); + TRACE( "%p new refcount %d\n", rowset, refs ); + return refs; +} + +static ULONG WINAPI enum_rowset_Release(IRowset *iface) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + LONG refs = InterlockedDecrement( &rowset->ref ); + TRACE( "%p new refcount %d\n", rowset, refs ); + if (!refs) + { + TRACE( "destroying %p\n", rowset ); + free( rowset ); + } + return refs; +} + +static HRESULT WINAPI enum_rowset_AddRefRows(IRowset *iface, DBCOUNTITEM count, + const HROW rows[], DBREFCOUNT ref_counts[], DBROWSTATUS status[]) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld, %p, %p, %p\n", rowset, count, rows, ref_counts, status); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_rowset_GetData(IRowset *iface, HROW row, HACCESSOR accessor, void *data) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld, %ld, %p\n", rowset, row, accessor, data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enum_rowset_GetNextRows(IRowset *iface, HCHAPTER reserved, DBROWOFFSET offset, + DBROWCOUNT count, DBCOUNTITEM *obtained, HROW **rows) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld, %ld, %ld, %p, %p\n", rowset, reserved, offset, count, obtained, rows); + + if (!obtained || !rows) + return E_INVALIDARG; + + *obtained = 0; + + if (!count) + return S_OK; + + return DB_S_ENDOFROWSET; +} + +static HRESULT WINAPI enum_rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM count, + const HROW rows[], DBROWOPTIONS options[], DBREFCOUNT ref_counts[], DBROWSTATUS status[]) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld, %p, %p, %p, %p\n", rowset, count, rows, options, ref_counts, status); + + return S_OK; +} + +static HRESULT WINAPI enum_rowset_RestartPosition(IRowset *iface, HCHAPTER reserved) +{ + struct msdasql_enum_rowset *rowset = msdasql_rs_from_IRowset( iface ); + + FIXME("%p, %ld\n", rowset, reserved); + + return S_OK; +} + +static const struct IRowsetVtbl enum_rowset_vtbl = +{ + enum_rowset_QueryInterface, + enum_rowset_AddRef, + enum_rowset_Release, + enum_rowset_AddRefRows, + enum_rowset_GetData, + enum_rowset_GetNextRows, + enum_rowset_ReleaseRows, + enum_rowset_RestartPosition +}; + static HRESULT WINAPI msdasql_enum_GetSourcesRowset(ISourcesRowset *iface, IUnknown *outer, REFIID riid, ULONG sets, DBPROPSET properties[], IUnknown **rowset) { struct msdasql_enum *enumerator = msdasql_enum_from_ISourcesRowset(iface); - FIXME("(%p) %p, %s, %d, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset); + struct msdasql_enum_rowset *enum_rs; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p) %p, %s, %d, %p, %p\n", enumerator, outer, debugstr_guid(riid), sets, properties, rowset); + + enum_rs = malloc(sizeof(*enum_rs)); + enum_rs->IRowset_iface.lpVtbl = &enum_rowset_vtbl; + enum_rs->ref = 1; + + hr = IRowset_QueryInterface(&enum_rs->IRowset_iface, riid, (void**)rowset); + IRowset_Release(&enum_rs->IRowset_iface); + return hr; } static const ISourcesRowsetVtbl msdsqlenum_vtbl = diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 7fdc3df4176..7e298fcb129 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -1073,19 +1073,19 @@ static void test_odbc_enumerator(void) } hr = ISourcesRowset_GetSourcesRowset(source, NULL, &IID_IRowset, 0, 0, (IUnknown**)&rowset); - todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); if (hr == S_OK) { IAccessor *accessor; IRowsetInfo *info; hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void **)&accessor); - ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(hr == S_OK, "got %08x\n", hr); if (hr == S_OK) IAccessor_Release(accessor); hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void **)&info); - ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(hr == S_OK, "got %08x\n", hr); if (hr == S_OK) IRowsetInfo_Release(info);

1 0

← Newer
1
...
81
82
83
84
85
86
87
...
96
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 November 2021