- Wine-Devel - list.winehq.org

[PATCH v3 2/8] dllhost: Add ISurrogate stub implementation.
by Dmitry Timoshkov March 8, 2022

March 8, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/Makefile.in | 2 +- programs/dllhost/dllhost.c | 84 +++++++++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/programs/dllhost/Makefile.in b/programs/dllhost/Makefile.in index a92add9c2f0..bca6c208cdc 100644 --- a/programs/dllhost/Makefile.in +++ b/programs/dllhost/Makefile.in @@ -1,5 +1,5 @@ MODULE = dllhost.exe -IMPORTS = ole32 +IMPORTS = ole32 uuid EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 39d2194db4b..a0d3b9937f1 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -18,6 +18,8 @@ #include <stdarg.h> +#define COBJMACROS + #include <windef.h> #include <winbase.h> #include <objbase.h> @@ -26,24 +28,104 @@ WINE_DEFAULT_DEBUG_CHANNEL(dllhost); +struct surrogate +{ + ISurrogate ISurrogate_iface; + LONG ref; +}; + +static inline struct surrogate *impl_from_ISurrogate(ISurrogate *iface) +{ + return CONTAINING_RECORD(iface, struct surrogate, ISurrogate_iface); +} + +static HRESULT WINAPI surrogate_QueryInterface(ISurrogate *iface, + REFIID iid, void **ppv) +{ + struct surrogate *surrogate = impl_from_ISurrogate(iface); + + TRACE("(%p,%s,%p)\n", iface, wine_dbgstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_ISurrogate)) + { + ISurrogate_AddRef(&surrogate->ISurrogate_iface); + *ppv = &surrogate->ISurrogate_iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI surrogate_AddRef(ISurrogate *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI surrogate_Release(ISurrogate *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI surrogate_LoadDllServer(ISurrogate *iface, const CLSID *clsid) +{ + FIXME("(%p,%s): stub\n", iface, wine_dbgstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI surrogate_FreeSurrogate(ISurrogate *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static const ISurrogateVtbl Surrogate_Vtbl = +{ + surrogate_QueryInterface, + surrogate_AddRef, + surrogate_Release, + surrogate_LoadDllServer, + surrogate_FreeSurrogate +}; + int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int showcmd) { HRESULT hr; CLSID clsid; + struct surrogate surrogate; if (wcsnicmp(cmdline, L"/PROCESSID:", 11)) return 0; cmdline += 11; + surrogate.ISurrogate_iface.lpVtbl = &Surrogate_Vtbl; + surrogate.ref = 1; + CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CLSIDFromString(cmdline, &clsid); if (hr == S_OK) { - FIXME("hosting object %s is not implemented\n", wine_dbgstr_guid(&clsid)); + CoRegisterSurrogate(&surrogate.ISurrogate_iface); + + hr = ISurrogate_LoadDllServer(&surrogate.ISurrogate_iface, &clsid); + if (hr != S_OK) + { + ERR("Can't create instance of %s\n", wine_dbgstr_guid(&clsid)); + goto cleanup; + } + + /* FIXME: wait for FreeSurrogate being called */ + Sleep(INFINITE); } +cleanup: CoUninitialize(); return 0; -- 2.35.1

2 1

[PATCH v3 1/8] dllhost: Add stub implementation.
by Dmitry Timoshkov March 8, 2022

March 8, 2022

v3: Switch to using /PROCESSID:{GUID} as a command line syntax. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure | 2 ++ configure.ac | 1 + programs/dllhost/Makefile.in | 7 +++++ programs/dllhost/dllhost.c | 50 ++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 programs/dllhost/Makefile.in create mode 100644 programs/dllhost/dllhost.c diff --git a/configure b/configure index 9ceef4c809b..511fc8b794a 100755 --- a/configure +++ b/configure @@ -1558,6 +1558,7 @@ enable_conhost enable_control enable_cscript enable_dism +enable_dllhost enable_dplaysvr enable_dpnsvr enable_dpvsetup @@ -22076,6 +22077,7 @@ wine_fn_config_makefile programs/conhost/tests enable_tests wine_fn_config_makefile programs/control enable_control wine_fn_config_makefile programs/cscript enable_cscript wine_fn_config_makefile programs/dism enable_dism +wine_fn_config_makefile programs/dllhost enable_dllhost wine_fn_config_makefile programs/dplaysvr enable_dplaysvr wine_fn_config_makefile programs/dpnsvr enable_dpnsvr wine_fn_config_makefile programs/dpvsetup enable_dpvsetup diff --git a/configure.ac b/configure.ac index d14cc396e51..f40d83eb18d 100644 --- a/configure.ac +++ b/configure.ac @@ -3258,6 +3258,7 @@ WINE_CONFIG_MAKEFILE(programs/conhost/tests) WINE_CONFIG_MAKEFILE(programs/control) WINE_CONFIG_MAKEFILE(programs/cscript) WINE_CONFIG_MAKEFILE(programs/dism) +WINE_CONFIG_MAKEFILE(programs/dllhost) WINE_CONFIG_MAKEFILE(programs/dplaysvr) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dpvsetup) diff --git a/programs/dllhost/Makefile.in b/programs/dllhost/Makefile.in new file mode 100644 index 00000000000..a92add9c2f0 --- /dev/null +++ b/programs/dllhost/Makefile.in @@ -0,0 +1,7 @@ +MODULE = dllhost.exe +IMPORTS = ole32 + +EXTRADLLFLAGS = -mwindows -municode + +C_SRCS = \ + dllhost.c diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c new file mode 100644 index 00000000000..39d2194db4b --- /dev/null +++ b/programs/dllhost/dllhost.c @@ -0,0 +1,50 @@ +/* + * Copyright 2022 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dllhost); + +int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int showcmd) +{ + HRESULT hr; + CLSID clsid; + + if (wcsnicmp(cmdline, L"/PROCESSID:", 11)) + return 0; + + cmdline += 11; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CLSIDFromString(cmdline, &clsid); + if (hr == S_OK) + { + FIXME("hosting object %s is not implemented\n", wine_dbgstr_guid(&clsid)); + } + + CoUninitialize(); + + return 0; +} -- 2.35.1

2 1

[PATCH 1/5] windows.gaming.input: Instantiate IGameController(BatteryInfo) stub from providers.
by Rémi Bernon March 8, 2022

March 8, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Not completely sure what was wrong with this patch but I've split it to avoid having non executed code and to leave the detail of COM aggregation for later. dlls/windows.gaming.input/manager.c | 265 +++++++++++++++++++++++++++- dlls/windows.gaming.input/private.h | 1 + 2 files changed, 264 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/manager.c b/dlls/windows.gaming.input/manager.c index e6366256fe7..15388f7df5d 100644 --- a/dlls/windows.gaming.input/manager.c +++ b/dlls/windows.gaming.input/manager.c @@ -18,12 +18,209 @@ */ #include "private.h" +#include "provider.h" #include "wine/debug.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(input); +static CRITICAL_SECTION manager_cs; +static CRITICAL_SECTION_DEBUG manager_cs_debug = +{ + 0, 0, &manager_cs, + { &manager_cs_debug.ProcessLocksList, &manager_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": manager_cs") } +}; +static CRITICAL_SECTION manager_cs = { &manager_cs_debug, -1, 0, 0, 0, 0 }; + +static struct list controller_list = LIST_INIT( controller_list ); + +struct controller +{ + IGameController IGameController_iface; + IGameControllerBatteryInfo IGameControllerBatteryInfo_iface; + LONG ref; + + struct list entry; + IGameControllerProvider *provider; + ICustomGameControllerFactory *factory; +}; + +static inline struct controller *impl_from_IGameController( IGameController *iface ) +{ + return CONTAINING_RECORD( iface, struct controller, IGameController_iface ); +} + +static HRESULT WINAPI controller_QueryInterface( IGameController *iface, REFIID iid, void **out ) +{ + struct controller *impl = impl_from_IGameController( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IGameController )) + { + IInspectable_AddRef( (*out = &impl->IGameController_iface) ); + return S_OK; + } + + if (IsEqualGUID( iid, &IID_IGameControllerBatteryInfo )) + { + IInspectable_AddRef( (*out = &impl->IGameControllerBatteryInfo_iface) ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI controller_AddRef( IGameController *iface ) +{ + struct controller *impl = impl_from_IGameController( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI controller_Release( IGameController *iface ) +{ + struct controller *impl = impl_from_IGameController( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) + { + ICustomGameControllerFactory_Release( impl->factory ); + IGameControllerProvider_Release( impl->provider ); + free( impl ); + } + + return ref; +} + +static HRESULT WINAPI controller_GetIids( IGameController *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_GetRuntimeClassName( IGameController *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_GetTrustLevel( IGameController *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_add_HeadsetConnected( IGameController *iface, ITypedEventHandler_IGameController_Headset *handler, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, handler %p, token %p stub!\n", iface, handler, token ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_remove_HeadsetConnected( IGameController *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %I64x stub!\n", iface, token.value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_add_HeadsetDisconnected( IGameController *iface, ITypedEventHandler_IGameController_Headset *handler, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, handler %p, token %p stub!\n", iface, handler, token ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_remove_HeadsetDisconnected( IGameController *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %I64x stub!\n", iface, token.value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_add_UserChanged( IGameController *iface, + ITypedEventHandler_IGameController_UserChangedEventArgs *handler, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, handler %p, token %p stub!\n", iface, handler, token ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_remove_UserChanged( IGameController *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %I64x stub!\n", iface, token.value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_get_Headset( IGameController *iface, IHeadset **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_get_IsWireless( IGameController *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_get_User( IGameController *iface, __x_ABI_CWindows_CSystem_CIUser **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IGameControllerVtbl controller_vtbl = +{ + controller_QueryInterface, + controller_AddRef, + controller_Release, + /* IInspectable methods */ + controller_GetIids, + controller_GetRuntimeClassName, + controller_GetTrustLevel, + /* IGameController methods */ + controller_add_HeadsetConnected, + controller_remove_HeadsetConnected, + controller_add_HeadsetDisconnected, + controller_remove_HeadsetDisconnected, + controller_add_UserChanged, + controller_remove_UserChanged, + controller_get_Headset, + controller_get_IsWireless, + controller_get_User, +}; + +DEFINE_IINSPECTABLE( battery, IGameControllerBatteryInfo, struct controller, IGameController_iface ) + +static HRESULT WINAPI battery_TryGetBatteryReport( IGameControllerBatteryInfo *iface, IBatteryReport **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IGameControllerBatteryInfoVtbl battery_vtbl = +{ + battery_QueryInterface, + battery_AddRef, + battery_Release, + /* IInspectable methods */ + battery_GetIids, + battery_GetRuntimeClassName, + battery_GetTrustLevel, + /* IGameControllerBatteryInfo methods */ + battery_TryGetBatteryReport, +}; + struct manager_statics { IActivationFactory IActivationFactory_iface; @@ -200,12 +397,76 @@ static struct manager_statics manager_statics = IActivationFactory *manager_factory = &manager_statics.IActivationFactory_iface; +static HRESULT controller_create( ICustomGameControllerFactory *factory, IGameControllerProvider *provider, + struct controller **out ) +{ + struct controller *impl; + + if (!(impl = malloc(sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IGameController_iface.lpVtbl = &controller_vtbl; + impl->IGameControllerBatteryInfo_iface.lpVtbl = &battery_vtbl; + impl->ref = 1; + + ICustomGameControllerFactory_AddRef( (impl->factory = factory) ); + IGameControllerProvider_AddRef( (impl->provider = provider) ); + + *out = impl; + return S_OK; +} + void manager_on_provider_created( IGameControllerProvider *provider ) { - FIXME( "provider %p stub!\n", provider ); + struct list *entry, *next, *list; + struct controller *controller; + HRESULT hr; + + TRACE( "provider %p\n", provider ); + + EnterCriticalSection( &manager_cs ); + + if (list_empty( &controller_list )) list = &controller_list; + else list = list_tail( &controller_list ); + + if (SUCCEEDED(controller_create( controller_factory, provider, &controller ))) + list_add_tail( &controller_list, &controller->entry ); + + LIST_FOR_EACH_SAFE( entry, next, list ) + { + controller = LIST_ENTRY( entry, struct controller, entry ); + hr = ICustomGameControllerFactory_OnGameControllerAdded( controller->factory, + &controller->IGameController_iface ); + if (FAILED(hr)) + { + list_remove( &controller->entry ); + IGameController_Release( &controller->IGameController_iface ); + } + if (next == &controller_list) break; + } + + LeaveCriticalSection( &manager_cs ); } void manager_on_provider_removed( IGameControllerProvider *provider ) { - FIXME( "provider %p stub!\n", provider ); + struct controller *controller, *next; + + TRACE( "provider %p\n", provider ); + + EnterCriticalSection( &manager_cs ); + + LIST_FOR_EACH_ENTRY( controller, &controller_list, struct controller, entry ) + { + if (controller->provider != provider) continue; + ICustomGameControllerFactory_OnGameControllerRemoved( controller->factory, + &controller->IGameController_iface ); + } + + LIST_FOR_EACH_ENTRY_SAFE( controller, next, &controller_list, struct controller, entry ) + { + if (controller->provider != provider) continue; + list_remove( &controller->entry ); + IGameController_Release( &controller->IGameController_iface ); + } + + LeaveCriticalSection( &manager_cs ); } diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index 24d0609aa7e..27dbdb8416c 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -31,6 +31,7 @@ #define WIDL_using_Windows_Foundation #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" +#define WIDL_using_Windows_Devices_Power #define WIDL_using_Windows_Gaming_Input #define WIDL_using_Windows_Gaming_Input_Custom #include "windows.gaming.input.custom.h" -- 2.35.1

1 4

[PATCH] winex11.drv: Fix crash when ctx is NULL in glxdrv_wglSwapBuffers().
by Yutao Meng March 8, 2022

March 8, 2022

The variable ctx can be NULL, and it is checked before every sync_context() function call. However, it is not checked in the ExtEscape() function call in which it is trying to get the hdc member variable of ctx. Signed-off-by: Yutao Meng <mengyutao(a)uniontech.com> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 567205f742c..6b179bc5c0d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3372,7 +3372,7 @@ static BOOL WINAPI glxdrv_wglSwapBuffers( HDC hdc ) release_gl_drawable( gl ); - if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); + if (ctx && escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); return TRUE; } -- 2.20.1

1 0

[PATCH] kernelbase: CopyFileExA support COPY_FILE_OPEN_SOURCE_FOR_WRITE flag
by Alistair Leslie-Hughes March 8, 2022

March 8, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/tests/file.c | 65 ++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 22 ++++++++++--- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 77174d43d5b..eb5bc5ceb36 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1202,6 +1202,70 @@ static void test_CopyFileEx(void) ok(!ret, "DeleteFileA unexpectedly succeeded\n"); } +static void test_CopyFileEx_CopyWrite(void) +{ + char temp_path[MAX_PATH]; + char source[MAX_PATH], dest[MAX_PATH]; + static const char prefix[] = "pfx"; + HANDLE hfile; + DWORD ret; + BOOL retok; + + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret != 0, "GetTempPathA error %ld\n", GetLastError()); + ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); + + ret = GetTempFileNameA(temp_path, prefix, 0, source); + ok(ret != 0, "GetTempFileNameA error %ld\n", GetLastError()); + + ret = GetTempFileNameA(temp_path, prefix, 0, dest); + ok(ret != 0, "GetTempFileNameA error %ld\n", GetLastError()); + + ret = DeleteFileA(dest); + ok(ret, "DeleteFileA Failed\n"); + + /* Test with Read access */ + hfile = CreateFileA(source, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %ld\n", GetLastError()); + + retok = CopyFileExA(source, dest, NULL, NULL, NULL, COPY_FILE_OPEN_SOURCE_FOR_WRITE); + ok(retok, "CopyFileExA failed\n"); + ok(GetLastError() == 0, "expected 0, got %ld\n", GetLastError()); + ok(GetFileAttributesA(dest) != INVALID_FILE_ATTRIBUTES, "file wasn't created\n"); + CloseHandle(hfile); + + ret = DeleteFileA(dest); + ok(ret, "DeleteFileA Failed\n"); + + /* Test with Shared Read access */ + hfile = CreateFileA(source, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %ld\n", GetLastError()); + + retok = CopyFileExA(source, dest, NULL, NULL, NULL, COPY_FILE_OPEN_SOURCE_FOR_WRITE); + ok(retok, "CopyFileExA failed\n"); + ok(GetLastError() == 0, "expected 0, got %ld\n", GetLastError()); + ok(GetFileAttributesA(dest) != INVALID_FILE_ATTRIBUTES, "file wasn't created\n"); + CloseHandle(hfile); + + ret = DeleteFileA(dest); + ok(ret, "DeleteFileA Failed\n"); + + /* Test with Shared R/W access */ + hfile = CreateFileA(source, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %ld\n", GetLastError()); + + retok = CopyFileExA(source, dest, NULL, NULL, NULL, COPY_FILE_OPEN_SOURCE_FOR_WRITE); + ok(retok, "CopyFileExA failed\n"); + ok(GetLastError() == 0, "got %ld\n", GetLastError()); + ok(GetFileAttributesA(dest) != INVALID_FILE_ATTRIBUTES, "file wasn't created\n"); + CloseHandle(hfile); + + ret = DeleteFileA(source); + ok(ret, "DeleteFileA failed with error %ld\n", GetLastError()); + ret = DeleteFileA(dest); + ok(ret, "DeleteFileA unexpectedly succeeded\n"); +} + /* * Debugging routine to dump a buffer in a hexdump-like fashion. */ @@ -6158,6 +6222,7 @@ START_TEST(file) test_CopyFileW(); test_CopyFile2(); test_CopyFileEx(); + test_CopyFileEx_CopyWrite(); test_CreateFile(); test_CreateFileA(); test_CreateFileW(); diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index c6dc904044a..3ea81e112a7 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -504,6 +504,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT DWORD count; BOOL ret = FALSE; char *buffer; + DWORD source_access = GENERIC_READ; if (!source || !dest) { @@ -518,12 +519,25 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT TRACE("%s -> %s, %lx\n", debugstr_w(source), debugstr_w(dest), flags); - if ((h1 = CreateFileW( source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + if (flags & COPY_FILE_OPEN_SOURCE_FOR_WRITE) + source_access |= GENERIC_WRITE; + + if ((h1 = CreateFileW( source, source_access, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE) { - WARN("Unable to open source %s\n", debugstr_w(source)); - HeapFree( GetProcessHeap(), 0, buffer ); - return FALSE; + /* Retry with Read mode, if we cannot open R/W */ + if (GetLastError() == ERROR_SHARING_VIOLATION && flags & COPY_FILE_OPEN_SOURCE_FOR_WRITE) + { + h1 = CreateFileW( source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, 0 ); + } + + if(h1 == INVALID_HANDLE_VALUE) + { + WARN("Unable to open source %s\n", debugstr_w(source)); + HeapFree( GetProcessHeap(), 0, buffer ); + return FALSE; + } } if (!set_ntstatus( NtQueryInformationFile( h1, &io, &info, sizeof(info), FileBasicInformation ))) -- 2.34.1

2 1

[PATCH 1/3] ntdll: Add NtAccessCheckByTypeAndAuditAlarm stub.
by Mohamad Al-Jaf March 8, 2022

March 8, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/security.c | 18 ++++++++++++++++++ include/winnt.h | 7 +++++++ include/winternl.h | 1 + 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d514bca5e11..b867767652e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -131,7 +131,7 @@ @ stdcall -syscall NtAccessCheck(ptr long long ptr ptr ptr ptr ptr) @ stdcall -syscall NtAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) # @ stub NtAccessCheckByType -# @ stub NtAccessCheckByTypeAndAuditAlarm +@ stdcall -syscall NtAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) # @ stub NtAccessCheckByTypeResultList # @ stub NtAccessCheckByTypeResultListAndAuditAlarm # @ stub NtAccessCheckByTypeResultListAndAuditAlarmByHandle diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 2955355353e..728ee961aa2 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -796,6 +796,24 @@ NTSTATUS WINAPI NtAccessCheckAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE ha } +/*********************************************************************** + * NtAccessCheckByTypeAndAuditAlarm (NTDLL.@) + */ +NTSTATUS WINAPI NtAccessCheckByTypeAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE handle, + UNICODE_STRING *type_name, UNICODE_STRING *name, + PSECURITY_DESCRIPTOR descr, PSID sid, ACCESS_MASK access, + AUDIT_EVENT_TYPE type, ULONG flags, POBJECT_TYPE_LIST list, + ULONG length, GENERIC_MAPPING *mapping, BOOLEAN creation, + ACCESS_MASK *access_granted, NTSTATUS *access_status, + BOOLEAN *on_close ) +{ + FIXME( "(%s, %p, %s, %s, %p, %p, 0x%08x, %u, 0x%08x, %p, %u, %p, %d, %p, %p, %p), stub\n", + debugstr_us(subsystem), handle, debugstr_us(type_name), debugstr_us(name), descr, sid, + access, type, flags, list, length, mapping, creation, access_granted, access_status, on_close ); + return STATUS_NOT_IMPLEMENTED; +} + + /*********************************************************************** * NtQuerySecurityObject (NTDLL.@) */ diff --git a/include/winnt.h b/include/winnt.h index 079858d2f7d..939c2f8d7dd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3633,6 +3633,13 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _AUDIT_EVENT_TYPE { + AuditEventObjectAccess, + AuditEventDirectoryServiceAccess +} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; + +#define AUDIT_ALLOW_NO_PRIVILEGE 0x1 + typedef enum _TOKEN_ELEVATION_TYPE { TokenElevationTypeDefault = 1, TokenElevationTypeFull, diff --git a/include/winternl.h b/include/winternl.h index 6a95c4e0fdc..8e236f9d97d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3912,6 +3912,7 @@ NTSYSAPI NTSTATUS WINAPI LdrUnregisterDllNotification(void*); NTSYSAPI NTSTATUS WINAPI NtAcceptConnectPort(PHANDLE,ULONG,PLPC_MESSAGE,BOOLEAN,PLPC_SECTION_WRITE,PLPC_SECTION_READ); NTSYSAPI NTSTATUS WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,NTSTATUS*); NTSYSAPI NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN); +NTSYSAPI NTSTATUS WINAPI NtAccessCheckByTypeAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,PSID,ACCESS_MASK,AUDIT_EVENT_TYPE,ULONG,POBJECT_TYPE_LIST,ULONG,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,NTSTATUS*,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI NtAddAtom(const WCHAR*,ULONG,RTL_ATOM*); NTSYSAPI NTSTATUS WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG,PTOKEN_GROUPS,PULONG); NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); -- 2.35.1

2 7

[PATCH] po: Update Lithuanian translation.
by Aurimas Fišeras March 8, 2022

March 8, 2022

1 0

Re: [PATCH v2 4/4] apisetschema: Add ext-ms-win-core-iuri-l1-1-0 entry.
by Mohamad Al-Jaf March 7, 2022

March 7, 2022

Hi, I have no idea why this patch was set to "No patch". Is this the incorrect way to add an apiset? I don't know what I did wrong. -- Kind regards, Mohamad

1 0

[PATCH 1/2] quartz/tests: Use the correct integer types.
by Zebediah Figura March 7, 2022

March 7, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/tests/dsoundrender.c | 3 ++- dlls/quartz/tests/filtergraph.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 03e6b8413d5..2e1289e715b 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -449,10 +449,11 @@ static void test_basic_audio(void) IBaseFilter *filter = create_dsound_render(); LONG balance, volume; ITypeInfo *typeinfo; + unsigned int count; IBasicAudio *audio; TYPEATTR *typeattr; - ULONG ref, count; HRESULT hr; + ULONG ref; hr = IBaseFilter_QueryInterface(filter, &IID_IBasicAudio, (void **)&audio); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 98f7b30717d..2496b556132 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2827,8 +2827,8 @@ static void test_control_delegation(void) IVideoWindow *window; IBasicVideo2 *video; ITypeInfo *typeinfo; + unsigned int count; TYPEATTR *typeattr; - ULONG count; HRESULT hr; LONG val; diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index a0ccb4898a9..45ec3313813 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3975,11 +3975,11 @@ static void test_windowless_size(void) IVMRAspectRatioControl9 *aspect_ratio_control; IVMRWindowlessControl9 *windowless_control; IFilterGraph2 *graph = create_graph(); - VMR9AspectRatioMode aspect_mode; struct testfilter source; IMemAllocator *allocator; RECT src, dst, expect; IMemInputPin *input; + DWORD aspect_mode; HWND window; HRESULT hr; ULONG ref; -- 2.35.1

2 3

[PATCH 1/7] ws2_32: Pre-validate optlen in getsockopt().
by Paul Gofman March 7, 2022

March 7, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 228827-228832. For reference, the full patchset (which adds more tests and fixes individual options) is here: https://github.com/gofman/wine/commits/winsock dlls/ws2_32/socket.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e5e29107853..30dc007167a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1395,11 +1395,18 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl TRACE( "socket %#Ix, %s, optval %p, optlen %p (%d)\n", s, debugstr_sockopt(level, optname), optval, optlen, optlen ? *optlen : 0 ); - if ((level != SOL_SOCKET || optname != SO_OPENTYPE) && - !socket_list_find( s )) + if ((level != SOL_SOCKET || optname != SO_OPENTYPE)) { - SetLastError( WSAENOTSOCK ); - return SOCKET_ERROR; + if (!socket_list_find( s )) + { + SetLastError( WSAENOTSOCK ); + return SOCKET_ERROR; + } + if (!optlen || *optlen <= 0) + { + SetLastError( WSAEFAULT ); + return -1; + } } switch(level) @@ -1464,7 +1471,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl } case SO_CONNECT_TIME: - if (!optlen || !optval) + if (!optval) { SetLastError( WSAEFAULT ); return -1; @@ -1483,7 +1490,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl int len = sizeof(linger); int ret; - if (!optlen || *optlen < sizeof(BOOL)|| !optval) + if (*optlen < sizeof(BOOL)|| !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1500,7 +1507,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl /* As mentioned in setsockopt, Windows ignores this, so we * always return true here */ case SO_DONTROUTE: - if (!optlen || *optlen < sizeof(BOOL) || !optval) + if (*optlen < sizeof(BOOL) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1521,7 +1528,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl int size; /* struct linger and LINGER have different sizes */ - if (!optlen || *optlen < sizeof(LINGER) || !optval) + if (*optlen < sizeof(LINGER) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1540,7 +1547,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl } case SO_MAX_MSG_SIZE: - if (!optlen || *optlen < sizeof(int) || !optval) + if (*optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1574,9 +1581,9 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl ret = ws_protocol_info(s, optname == SO_PROTOCOL_INFOW, &infow, &size); if (ret) { - if (!optlen || !optval || *optlen < size) + if (!optval || *optlen < size) { - if(optlen) *optlen = size; + *optlen = size; ret = 0; SetLastError(WSAEFAULT); } @@ -1606,7 +1613,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl WSAPROTOCOL_INFOW info; int size; - if (!optlen || *optlen < sizeof(int) || !optval) + if (*optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1765,7 +1772,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP, optval, optlen ); case IPV6_PROTECTION_LEVEL: - if (!optlen || *optlen < sizeof(UINT) || !optval) + if (*optlen < sizeof(UINT) || !optval) { SetLastError( WSAEFAULT ); return -1; -- 2.35.1

3 15