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

Alexandre Julliard : ntdll: Export Unix user name in WINEUSERNAME variable.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 52bf0fbd4792130af8a847856b264b99e7177d18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52bf0fbd4792130af8a84785… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 15:15:07 2020 +0200 ntdll: Export Unix user name in WINEUSERNAME variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index b37649764c..b15a425556 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -377,15 +377,16 @@ static void set_wow64_environment( WCHAR **env ) static const WCHAR winehomedirW[] = {'W','I','N','E','H','O','M','E','D','I','R',0}; static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; + static const WCHAR wineusernameW[] = {'W','I','N','E','U','S','E','R','N','A','M','E',0}; static const WCHAR wineconfigdirW[] = {'W','I','N','E','C','O','N','F','I','G','D','I','R',0}; - WCHAR buf[64]; + WCHAR buf[256]; UNICODE_STRING arch_strW = { sizeof(archW) - sizeof(WCHAR), sizeof(archW), archW }; UNICODE_STRING arch6432_strW = { sizeof(arch6432W) - sizeof(WCHAR), sizeof(arch6432W), arch6432W }; UNICODE_STRING valW = { 0, sizeof(buf), buf }; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - const char *path; + const char *p, *name; WCHAR *val; HANDLE hkey; DWORD i; @@ -396,14 +397,22 @@ static void set_wow64_environment( WCHAR **env ) set_wine_path_variable( env, winehomedirW, getenv("HOME") ); set_wine_path_variable( env, winebuilddirW, wine_get_build_dir() ); set_wine_path_variable( env, wineconfigdirW, wine_get_config_dir() ); - for (i = 0; (path = wine_dll_enum_load_path( i )); i++) + for (i = 0; (p = wine_dll_enum_load_path( i )); i++) { NTDLL_swprintf( buf, winedlldirW, i ); - set_wine_path_variable( env, buf, path ); + set_wine_path_variable( env, buf, p ); } NTDLL_swprintf( buf, winedlldirW, i ); set_wine_path_variable( env, buf, NULL ); + /* set user name */ + + name = wine_get_user_name(); + if ((p = strrchr( name, '/' ))) name = p + 1; + if ((p = strrchr( name, '\\' ))) name = p + 1; + ntdll_umbstowcs( name, strlen(name) + 1, buf, ARRAY_SIZE(buf) ); + set_env_var( env, wineusernameW, buf ); + /* set the PROCESSOR_ARCHITECTURE variable */ if (!RtlQueryEnvironmentVariable_U( *env, &arch6432_strW, &valW ))

1 0

Alexandre Julliard : winegcc: Fixup constructors after building a module.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: c30d30d328408a9031477e084377f8d7eef11e74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c30d30d328408a9031477e08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:21:48 2020 +0200 winegcc: Fixup constructors after building a module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b2a4f9189e..0682e9aa9a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -936,6 +936,16 @@ static strarray *get_winebuild_args(struct options *opts) return spec_args; } +static void fixup_constructors( struct options *opts, const char *file ) +{ + strarray *args = get_winebuild_args( opts ); + + strarray_add( args, "--fixup-ctors" ); + strarray_add( args, file ); + spawn( opts->prefix, args, 0 ); + strarray_free( args ); +} + static void make_wine_builtin( struct options *opts, const char *file ) { strarray *args = get_winebuild_args( opts ); @@ -1354,8 +1364,6 @@ static void build(struct options* opts) spawn(opts->prefix, link_args, 0); strarray_free (link_args); - if (is_pe && opts->wine_builtin) make_wine_builtin( opts, output_path ); - /* set the base address with prelink if linker support is not present */ if (opts->prelink && !opts->target) { @@ -1371,6 +1379,9 @@ static void build(struct options* opts) } } + if (!is_pe && !opts->shared) fixup_constructors( opts, output_path ); + if (is_pe && opts->wine_builtin) make_wine_builtin( opts, output_path ); + /* create the loader script */ if (generate_app_loader) create_file(output_file, 0755, app_loader_template, strmake("%s.so", output_name));

1 0

Alexandre Julliard : ntdll: Load .so builtin modules without using libwine.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 0a3e42e2719e8306b67f14b5a4b3a868f336bb82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a3e42e2719e8306b67f14b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 10:26:13 2020 +0200 ntdll: Load .so builtin modules without using libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 273 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 229 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a3e42e2719e8306b67f…

1 0

Alexandre Julliard : winebuild: Set page size to 4096 also on ARM64.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 593c38cb95fc18383664dc63cf397be5a7175be5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=593c38cb95fc18383664dc63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 10:40:56 2020 +0200 winebuild: Set page size to 4096 also on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index be87708048..669520711c 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1015,19 +1015,7 @@ unsigned int get_alignment(unsigned int align) /* return the page size for the target CPU */ unsigned int get_page_size(void) { - switch(target_cpu) - { - case CPU_x86: - case CPU_x86_64: - case CPU_POWERPC: - case CPU_ARM: - return 0x1000; - case CPU_ARM64: - return 0x10000; - } - /* unreached */ - assert(0); - return 0; + return 0x1000; /* same on all platforms */ } /* return the size of a pointer on the target CPU */

1 0

Alexandre Julliard : ntdll: Execute .so constructors during module initialization.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 081c8e1c73bb8d79a060da7816b5c429180b35b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=081c8e1c73bb8d79a060da78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:22:24 2020 +0200 ntdll: Execute .so constructors during module initialization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c32292d453..0568be63ad 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -24,6 +24,9 @@ #include <assert.h> #include <stdarg.h> +#ifdef HAVE_LINK_H +# include <link.h> +#endif #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif @@ -1306,6 +1309,42 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) } +/************************************************************************* + * call_constructors + */ +static void call_constructors( WINE_MODREF *wm ) +{ +#ifdef HAVE_DLINFO + extern char **__wine_main_environ; + struct link_map *map; + void (*init_func)(int, char **, char **) = NULL; + void (**init_array)(int, char **, char **) = NULL; + ULONG_PTR i, init_arraysz = 0; + + if (dlinfo( wm->so_handle, RTLD_DI_LINKMAP, &map ) == -1) return; + while (map->l_ld->d_tag) + { + switch (map->l_ld->d_tag) + { + case 0x60009990: init_array = (void *)((char *)map->l_addr + map->l_ld->d_un.d_val); break; + case 0x60009991: init_arraysz = map->l_ld->d_un.d_val; break; + case 0x60009992: init_func = (void *)((char *)map->l_addr + map->l_ld->d_un.d_val); break; + } + map->l_ld++; + } + + TRACE( "%s: got init_func %p init_array %p %lu\n", debugstr_us( &wm->ldr.BaseDllName ), + init_func, init_array, init_arraysz ); + + if (init_func) init_func( __wine_main_argc, __wine_main_argv, __wine_main_environ ); + + if (init_array) + for (i = 0; i < init_arraysz / sizeof(*init_array); i++) + init_array[i]( __wine_main_argc, __wine_main_argv, __wine_main_environ ); +#endif +} + + /************************************************************************* * MODULE_InitDLL */ @@ -1321,6 +1360,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.BaseAddress, reason ); + if (wm->so_handle && reason == DLL_PROCESS_ATTACH) call_constructors( wm ); if (!entry) return STATUS_SUCCESS; if (TRACE_ON(relay)) @@ -3979,6 +4019,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow } attach_implicitly_loaded_dlls( context ); virtual_release_address_space(); + if (wm->so_handle) call_constructors( wm ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); } else

1 0

Zebediah Figura : winegstreamer: Remove some unused imports.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: ecac569df231d7a0f8b11ca7cf8803642986fefb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecac569df231d7a0f8b11ca7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 00:33:58 2020 -0500 winegstreamer: Remove some unused imports. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 2364ac84dc..097edf273f 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,5 +1,5 @@ MODULE = winegstreamer.dll -IMPORTS = strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 mfplat mfuuid +IMPORTS = strmiids uuid ole32 mfplat mfuuid EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) PARENTSRC = ../strmbase

1 0

Dmitry Timoshkov : schedsvc/tests: Fix compilation with recent gcc/clang versions.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 1d785798605c01dcfc8a2f9f6ecc24bc21351029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d785798605c01dcfc8a2f9f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 15 21:43:42 2020 +0800 schedsvc/tests: Fix compilation with recent gcc/clang versions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/atsvcapi.c | 6 +++--- dlls/schedsvc/tests/rpcapi.c | 6 +++--- dlls/taskschd/task.c | 4 ++-- include/wine/atsvc.idl | 2 +- include/wine/schrpc.idl | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index d7d48a122c..f10c9d0723 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -31,7 +31,7 @@ #define JOB_ADD_CURRENT_DATE 0x08 #define JOB_NONINTERACTIVE 0x10 -extern handle_t rpc_handle; +extern handle_t atsvc_handle; static int test_failures, test_skipped; @@ -69,7 +69,7 @@ START_TEST(atsvcapi) hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); - hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingA(binding_str, &atsvc_handle); ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); hr = RpcStringFreeA(&binding_str); ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); @@ -173,7 +173,7 @@ skip_tests_delete: skip_tests: SetUnhandledExceptionFilter(old_exception_filter); - hr = RpcBindingFree(&rpc_handle); + hr = RpcBindingFree(&atsvc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); } diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 9d9557fe1c..b791a047dc 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -25,7 +25,7 @@ #include "wine/test.h" -extern handle_t rpc_handle; +extern handle_t schrpc_handle; static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) { @@ -103,7 +103,7 @@ START_TEST(rpcapi) hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); - hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingA(binding_str, &schrpc_handle); ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); hr = RpcStringFreeA(&binding_str); ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); @@ -537,7 +537,7 @@ todo_wine MIDL_user_free(path); } - hr = RpcBindingFree(&rpc_handle); + hr = RpcBindingFree(&schrpc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); } diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index b75cfff8af..8d81a18b3f 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3843,7 +3843,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V DWORD len; HRESULT hr; RPC_WSTR binding_str; - extern handle_t rpc_handle; + extern handle_t schrpc_handle; TRACE("%p,%s,%s,%s,%s\n", iface, debugstr_variant(&server), debugstr_variant(&user), debugstr_variant(&domain), debugstr_variant(&password)); @@ -3882,7 +3882,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); if (hr != RPC_S_OK) return hr; - hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingW(binding_str, &schrpc_handle); RpcStringFreeW(&binding_str); if (hr != RPC_S_OK) return hr; diff --git a/include/wine/atsvc.idl b/include/wine/atsvc.idl index e95e6cf110..5e7121d016 100644 --- a/include/wine/atsvc.idl +++ b/include/wine/atsvc.idl @@ -23,7 +23,7 @@ import "ocidl.idl"; [ uuid(1ff70682-0a51-30e8-076d-740be8cee98b), - implicit_handle(handle_t rpc_handle), + implicit_handle(handle_t atsvc_handle), version(1.0), pointer_default(unique) ] diff --git a/include/wine/schrpc.idl b/include/wine/schrpc.idl index 4af709d8dd..944f283081 100644 --- a/include/wine/schrpc.idl +++ b/include/wine/schrpc.idl @@ -26,7 +26,7 @@ import "ocidl.idl"; [ uuid(86d35949-83c9-4044-b424-db363231fd0c), - implicit_handle(handle_t rpc_handle), + implicit_handle(handle_t schrpc_handle), version(1.0), pointer_default(unique) ]

1 0

Nikolay Sivov : mfplat: Fix subtype test condition for MFInitMediaTypeFromWaveFormatEx().
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: f6c131f5f3937daf7dd562a0ff6a6f1c0b6fb2b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6c131f5f3937daf7dd562a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 15 16:47:37 2020 +0300 mfplat: Fix subtype test condition for MFInitMediaTypeFromWaveFormatEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index ddbffd5441..620e144d34 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2128,7 +2128,7 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { - mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &wfex->SubFormat, &hr); + memcpy(&subtype, &wfex->SubFormat, sizeof(subtype)); if (wfex->dwChannelMask) mediatype_set_uint32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, wfex->dwChannelMask, &hr); @@ -2140,10 +2140,10 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA { memcpy(&subtype, &MFAudioFormat_Base, sizeof(subtype)); subtype.Data1 = format->wFormatTag; - mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &subtype, &hr); mediatype_set_uint32(mediatype, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1, &hr); } + mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &subtype, &hr); if (format->nChannels) mediatype_set_uint32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, format->nChannels, &hr);

1 0

Jacek Caban : winnt.h: Add __readgsqword declaration.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 6ba6aac5a3c7df59705d198c5625f7c676a1ce27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ba6aac5a3c7df59705d198c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 19:36:05 2020 +0200 winnt.h: Add __readgsqword declaration. pragma intrinsic is meant only as an addition to C declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnt.h b/include/winnt.h index a948ad001a..057f178845 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2667,6 +2667,7 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) return teb; } #elif defined(__x86_64__) && defined(_MSC_VER) +unsigned __int64 __readgsqword(unsigned long); #pragma intrinsic(__readgsqword) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) {

1 0

Jacek Caban : kernelbase: Implement CreateThreadpoolIo.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: b66e13ef249065abf693500faa77d0161bc92a11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b66e13ef249065abf693500f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 02:00:18 2020 +0200 kernelbase: Implement CreateThreadpoolIo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/thread.c | 15 ++++++++++++--- dlls/ntdll/tests/threadpool.c | 4 +--- dlls/ntdll/threadpool.c | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 94ea9c49de..99f64e072b 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1187,14 +1187,23 @@ PTP_CLEANUP_GROUP WINAPI DECLSPEC_HOTPATCH CreateThreadpoolCleanupGroup(void) } +static void WINAPI tp_io_callback( TP_CALLBACK_INSTANCE *instance, void *userdata, void *cvalue, IO_STATUS_BLOCK *iosb, TP_IO *io ) +{ + PTP_WIN32_IO_CALLBACK callback = *(void **)io; + callback( instance, userdata, cvalue, RtlNtStatusToDosError( iosb->u.Status ), iosb->Information, io ); +} + + /*********************************************************************** * CreateThreadpoolIo (kernelbase.@) */ -PTP_IO WINAPI /* DECLSPEC_HOTPATCH */ CreateThreadpoolIo( HANDLE handle, PTP_WIN32_IO_CALLBACK callback, +PTP_IO WINAPI DECLSPEC_HOTPATCH CreateThreadpoolIo( HANDLE handle, PTP_WIN32_IO_CALLBACK callback, PVOID userdata, TP_CALLBACK_ENVIRON *environment ) { - FIXME( "(%p, %p, %p, %p): stub\n", handle, callback, userdata, environment ); - return FALSE; + TP_IO *io; + if (!set_ntstatus( TpAllocIoCompletion( &io, handle, tp_io_callback, userdata, environment ))) return NULL; + *(void **)io = callback; /* ntdll leaves us space to store our callback at the beginning of TP_IO struct */ + return io; } diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 2984983a06..24f32346fb 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -2130,9 +2130,7 @@ static void test_kernel32_tp_io(void) environment.Pool = pool; io = NULL; io = pCreateThreadpoolIo(server, kernel32_io_cb, &userdata, &environment); - todo_wine ok(!!io, "expected non-NULL TP_IO\n"); - if (!io) - return; + ok(!!io, "expected non-NULL TP_IO\n"); pWaitForThreadpoolIoCallbacks(io, FALSE); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 215a5e9c53..87bfdb0751 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -153,6 +153,7 @@ struct io_completion /* internal threadpool object representation */ struct threadpool_object { + void *win32_callback; /* leave space for kernelbase to store win32 callback */ LONG refcount; BOOL shutdown; /* read-only information */

1 0