October 2021 - Wine-Commits

Piotr Caban : ucrtbase: Add __std_terminate export.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 776c840aa5edf2bd0bd0617a673cf4e8f9ba48b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=776c840aa5edf2bd0bd0617a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 11 16:15:27 2021 +0200 ucrtbase: Add __std_terminate export. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 1 + dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 246dde7dbdf..ea6cfa2a7f9 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -45,7 +45,7 @@ @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy -@ cdecl __std_terminate() ucrtbase.terminate +@ cdecl __std_terminate() ucrtbase.__std_terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ cdecl __std_type_info_hash(ptr) ucrtbase.__std_type_info_hash diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index cc6f2e70f6b..d39387d5f00 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -142,6 +142,7 @@ @ cdecl __setusermatherr(ptr) @ cdecl __std_exception_copy(ptr ptr) @ cdecl __std_exception_destroy(ptr) +@ cdecl __std_terminate() terminate @ cdecl __std_type_info_compare(ptr ptr) @ cdecl __std_type_info_destroy_list(ptr) @ cdecl __std_type_info_hash(ptr) diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index f799bcd4db5..9ca10cc2a70 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -38,7 +38,7 @@ @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy -@ cdecl __std_terminate() ucrtbase.terminate +@ cdecl __std_terminate() ucrtbase.__std_terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ cdecl __std_type_info_hash(ptr) ucrtbase.__std_type_info_hash

1 0

Alexandre Julliard : wmcodecdspuuid: Move to the libs directory.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 83ca429073a4f9918013453021308c514fb15ed9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83ca429073a4f99180134530… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:34:03 2021 +0200 wmcodecdspuuid: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/wmcodecdspuuid/Makefile.in | 0 {dlls => libs}/wmcodecdspuuid/wmcodecdspuuid.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index fb8cd48920a..959c08e5506 100755 --- a/configure +++ b/configure @@ -1711,7 +1711,6 @@ enable_wlanapi enable_wlanui enable_wldap32 enable_wmasf -enable_wmcodecdspuuid enable_wmi enable_wmiutils enable_wmp @@ -1787,6 +1786,7 @@ enable_strmiids enable_uuid enable_wbemuuid enable_wine +enable_wmcodecdspuuid enable_loader enable_nls enable_po @@ -20833,7 +20833,6 @@ wine_fn_config_makefile dlls/wlanui enable_wlanui wine_fn_config_makefile dlls/wldap32 enable_wldap32 wine_fn_config_makefile dlls/wldap32/tests enable_tests wine_fn_config_makefile dlls/wmasf enable_wmasf -wine_fn_config_makefile dlls/wmcodecdspuuid enable_wmcodecdspuuid wine_fn_config_makefile dlls/wmi enable_wmi wine_fn_config_makefile dlls/wmiutils enable_wmiutils wine_fn_config_makefile dlls/wmiutils/tests enable_tests @@ -20923,6 +20922,7 @@ wine_fn_config_makefile libs/strmiids enable_strmiids wine_fn_config_makefile libs/uuid enable_uuid wine_fn_config_makefile libs/wbemuuid enable_wbemuuid wine_fn_config_makefile libs/wine enable_wine +wine_fn_config_makefile libs/wmcodecdspuuid enable_wmcodecdspuuid wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls wine_fn_config_makefile po enable_po diff --git a/configure.ac b/configure.ac index 5732f5aad70..4eecb1f24f4 100644 --- a/configure.ac +++ b/configure.ac @@ -3720,7 +3720,6 @@ WINE_CONFIG_MAKEFILE(dlls/wlanui) WINE_CONFIG_MAKEFILE(dlls/wldap32) WINE_CONFIG_MAKEFILE(dlls/wldap32/tests) WINE_CONFIG_MAKEFILE(dlls/wmasf) -WINE_CONFIG_MAKEFILE(dlls/wmcodecdspuuid) WINE_CONFIG_MAKEFILE(dlls/wmi) WINE_CONFIG_MAKEFILE(dlls/wmiutils) WINE_CONFIG_MAKEFILE(dlls/wmiutils/tests) @@ -3810,6 +3809,7 @@ WINE_CONFIG_MAKEFILE(libs/strmiids) WINE_CONFIG_MAKEFILE(libs/uuid) WINE_CONFIG_MAKEFILE(libs/wbemuuid) WINE_CONFIG_MAKEFILE(libs/wine) +WINE_CONFIG_MAKEFILE(libs/wmcodecdspuuid) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) WINE_CONFIG_MAKEFILE(po) diff --git a/dlls/wmcodecdspuuid/Makefile.in b/libs/wmcodecdspuuid/Makefile.in similarity index 100% rename from dlls/wmcodecdspuuid/Makefile.in rename to libs/wmcodecdspuuid/Makefile.in diff --git a/dlls/wmcodecdspuuid/wmcodecdspuuid.c b/libs/wmcodecdspuuid/wmcodecdspuuid.c similarity index 100% rename from dlls/wmcodecdspuuid/wmcodecdspuuid.c rename to libs/wmcodecdspuuid/wmcodecdspuuid.c

1 0

Jacek Caban : win32u: Use syscall interface for some font functions.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 0dfedf79b6eaeef7abd9d831a542ccd0950d86c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dfedf79b6eaeef7abd9d831… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:49:36 2021 +0200 win32u: Use syscall interface for some font functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/gdiobj.c | 8 ---- dlls/win32u/syscall.c | 8 ++++ dlls/win32u/win32u.spec | 16 ++++---- dlls/win32u/win32u_private.h | 14 ------- dlls/win32u/wrappers.c | 46 --------------------- dlls/wow64win/gdi.c | 89 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 ++++ dlls/wow64win/wow64win_private.h | 12 ++++++ 8 files changed, 125 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0dfedf79b6eaeef7abd9…

1 0

Jacek Caban : win32u: Use syscall interface for some palette functions.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: fe96d12a89b8d43ab1d8dd3bd5432695ecc2869d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe96d12a89b8d43ab1d8dd3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:51:06 2021 +0200 win32u: Use syscall interface for some palette functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/gdiobj.c | 5 ----- dlls/win32u/syscall.c | 5 +++++ dlls/win32u/win32u.spec | 10 +++++----- dlls/win32u/win32u_private.h | 5 ----- dlls/win32u/wrappers.c | 25 ------------------------- dlls/wow64win/gdi.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 5 +++++ 7 files changed, 54 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe96d12a89b8d43ab1d8…

1 0

Alex Henrie : dhcpcsvc6: Add stub DLL.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 5abee26b8a2849847c15a9d8f08fd9c90154f05a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5abee26b8a2849847c15a9d8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 11 00:16:53 2021 -0600 dhcpcsvc6: Add stub DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51863 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dhcpcsvc6/Makefile.in | 3 +++ dlls/dhcpcsvc6/dhcpcsvc6.spec | 22 ++++++++++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/configure b/configure index 959c08e5506..7f863aa38c0 100755 --- a/configure +++ b/configure @@ -1264,6 +1264,7 @@ enable_ddraw enable_ddrawex enable_devenum enable_dhcpcsvc +enable_dhcpcsvc6 enable_dhtmled_ocx enable_difxapi enable_dinput @@ -20151,6 +20152,7 @@ wine_fn_config_makefile dlls/devenum enable_devenum wine_fn_config_makefile dlls/devenum/tests enable_tests wine_fn_config_makefile dlls/dhcpcsvc enable_dhcpcsvc wine_fn_config_makefile dlls/dhcpcsvc/tests enable_tests +wine_fn_config_makefile dlls/dhcpcsvc6 enable_dhcpcsvc6 wine_fn_config_makefile dlls/dhtmled.ocx enable_dhtmled_ocx wine_fn_config_makefile dlls/difxapi enable_difxapi wine_fn_config_makefile dlls/dinput enable_dinput diff --git a/configure.ac b/configure.ac index 4eecb1f24f4..1821feefa49 100644 --- a/configure.ac +++ b/configure.ac @@ -3038,6 +3038,7 @@ WINE_CONFIG_MAKEFILE(dlls/devenum) WINE_CONFIG_MAKEFILE(dlls/devenum/tests) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests) +WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc6) WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx) WINE_CONFIG_MAKEFILE(dlls/difxapi) WINE_CONFIG_MAKEFILE(dlls/dinput) diff --git a/dlls/dhcpcsvc6/Makefile.in b/dlls/dhcpcsvc6/Makefile.in new file mode 100644 index 00000000000..6b3e0d03000 --- /dev/null +++ b/dlls/dhcpcsvc6/Makefile.in @@ -0,0 +1,3 @@ +MODULE = dhcpcsvc6.dll + +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/dhcpcsvc6/dhcpcsvc6.spec b/dlls/dhcpcsvc6/dhcpcsvc6.spec new file mode 100644 index 00000000000..2ac66d9a34f --- /dev/null +++ b/dlls/dhcpcsvc6/dhcpcsvc6.spec @@ -0,0 +1,22 @@ +@ stub Dhcpv6AcquireParameters +@ stub Dhcpv6CApiCleanup +@ stub Dhcpv6CApiInitialize +@ stub Dhcpv6CancelOperation +@ stub Dhcpv6EnableDhcp +@ stub Dhcpv6EnableTracing +@ stub Dhcpv6FreeLeaseInfo +@ stub Dhcpv6FreeLeaseInfoArray +@ stub Dhcpv6GetTraceArray +@ stub Dhcpv6GetUserClasses +@ stub Dhcpv6IsEnabled +@ stub Dhcpv6QueryLeaseInfo +@ stub Dhcpv6QueryLeaseInfoArray +@ stub Dhcpv6ReleaseParameters +@ stub Dhcpv6ReleasePrefix +@ stub Dhcpv6ReleasePrefixEx +@ stub Dhcpv6RenewPrefix +@ stub Dhcpv6RenewPrefixEx +@ stub Dhcpv6RequestParams +@ stub Dhcpv6RequestPrefix +@ stub Dhcpv6RequestPrefixEx +@ stub Dhcpv6SetUserClass

1 0

Jan Sikorski : wined3d: Do not call wined3d_device_destroy_default_samplers() in the CS thread.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 33449ed625b93ed1507b2bdb98d57bf828adcbdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=33449ed625b93ed1507b2bdb… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Oct 7 12:57:26 2021 +0200 wined3d: Do not call wined3d_device_destroy_default_samplers() in the CS thread. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/device.c | 4 +--- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index bba728e2fb5..3a6ff54eec2 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4575,6 +4575,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device) { TRACE("device %p.\n", device); + wined3d_device_destroy_default_samplers(device); wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 91a6b92b4aa..5667cd8d0d3 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -748,7 +748,6 @@ static void adapter_vk_uninit_3d_cs(void *object) device->shader_backend->shader_free_private(device, &context_vk->c); wined3d_device_vk_destroy_null_views(device_vk, context_vk); wined3d_device_vk_destroy_null_resources(device_vk, context_vk); - wined3d_device_destroy_default_samplers(device, &context_vk->c); } static void adapter_vk_uninit_3d(struct wined3d_device *device) @@ -761,6 +760,7 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) device_vk = wined3d_device_vk(device); context_vk = &device_vk->context_vk; + wined3d_device_destroy_default_samplers(device); wined3d_cs_destroy_object(device->cs, adapter_vk_uninit_3d_cs, device_vk); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8020f7d0844..436c4dfe854 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -572,8 +572,7 @@ void wined3d_device_create_default_samplers(struct wined3d_device *device, struc } } -/* Context activation is done by the caller. */ -void wined3d_device_destroy_default_samplers(struct wined3d_device *device, struct wined3d_context *context) +void wined3d_device_destroy_default_samplers(struct wined3d_device *device) { wined3d_sampler_decref(device->default_sampler); device->default_sampler = NULL; @@ -982,7 +981,6 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) device->blitter->ops->blitter_destroy(device->blitter, context); device->shader_backend->shader_free_private(device, context); wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl); - wined3d_device_destroy_default_samplers(device, context); context_release(context); while (device->context_count) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c169ec344b..657b6acee39 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3889,8 +3889,7 @@ void wined3d_device_create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_device_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; -void wined3d_device_destroy_default_samplers(struct wined3d_device *device, - struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_device_destroy_default_samplers(struct wined3d_device *device) DECLSPEC_HIDDEN; HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count,

1 0

Alex Henrie : winemenubuilder: Return pointer from freedesktop_mime_type_for_extension.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 38eb26f047178b619c99ffcf546d3f196e519fe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38eb26f047178b619c99ffcf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 3 23:51:22 2021 -0600 winemenubuilder: Return pointer from freedesktop_mime_type_for_extension. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e02d7bd787f..51d83aed971 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1874,29 +1874,26 @@ static BOOL build_native_mime_types(struct list *mime_types) return ret; } -static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, - LPCWSTR extensionW, - WCHAR **match) +static WCHAR *freedesktop_mime_type_for_extension(struct list *native_mime_types, + const WCHAR *extensionW) { struct xdg_mime_type *mime_type_entry; int matchLength = 0; - - *match = NULL; + const WCHAR* match = NULL; LIST_FOR_EACH_ENTRY(mime_type_entry, native_mime_types, struct xdg_mime_type, entry) { if (PathMatchSpecW( extensionW, mime_type_entry->glob )) { - if (*match == NULL || matchLength < lstrlenW(mime_type_entry->glob)) + if (match == NULL || matchLength < lstrlenW(mime_type_entry->glob)) { - *match = mime_type_entry->mimeType; + match = mime_type_entry->mimeType; matchLength = lstrlenW(mime_type_entry->glob); } } } - if (*match != NULL) *match = xwcsdup(*match); - return TRUE; + return match ? xwcsdup(match) : NULL; } static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) @@ -2190,8 +2187,7 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic if (contentTypeW) wcslwr(contentTypeW); - if (!freedesktop_mime_type_for_extension(&nativeMimeTypes, extensionW, &mimeType)) - goto end; + mimeType = freedesktop_mime_type_for_extension(&nativeMimeTypes, extensionW); if (mimeType == NULL) {

1 0

Jacek Caban : win32u: Use syscall interface for some GDI objects functions.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 6fbbbe1f14a250d0d965849b7545331a54d2f82e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fbbbe1f14a250d0d965849b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:50:09 2021 +0200 win32u: Use syscall interface for some GDI objects functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/gdiobj.c | 6 ------ dlls/win32u/syscall.c | 6 ++++++ dlls/win32u/win32u.spec | 12 +++++------ dlls/win32u/win32u_private.h | 6 ------ dlls/win32u/wrappers.c | 30 ---------------------------- dlls/wow64win/gdi.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 6 ++++++ 7 files changed, 65 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6fbbbe1f14a250d0d965…

1 0

Jacek Caban : win32u: Use syscall interface for region functions.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 59e6d3b693ecae32d0abaaf790204976a96e5a14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59e6d3b693ecae32d0abaaf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:48:44 2021 +0200 win32u: Use syscall interface for region functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/gdiobj.c | 13 ----- dlls/win32u/syscall.c | 13 +++++ dlls/win32u/win32u.spec | 26 +++++----- dlls/win32u/win32u_private.h | 14 ----- dlls/win32u/wrappers.c | 66 ----------------------- dlls/wow64win/gdi.c | 121 +++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 15 +++++- 7 files changed, 161 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59e6d3b693ecae32d0ab…

1 0

Ted Lyngmo : ucrtbase: Add support for x mode in fopen.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 51b9f4cd2b7faa04d5bfd50dfe9a4382e0b76fc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51b9f4cd2b7faa04d5bfd50d… Author: Ted Lyngmo <ted(a)lyncon.se> Date: Mon Oct 11 16:15:39 2021 +0200 ucrtbase: Add support for x mode in fopen. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51846 Signed-off-by: Ted Lyngmo <ted(a)lyncon.se> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 7 +++++++ dlls/ucrtbase/tests/misc.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index da43316ebb8..274ddd5a29b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1586,6 +1586,13 @@ static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_fl *open_flags |= _O_TEXT; *open_flags &= ~_O_BINARY; break; +#if _MSVCR_VER>=140 + case 'x': + if(!MSVCRT_CHECK_PMT((*open_flags & (_O_CREAT | _O_APPEND)) == _O_CREAT)) + return -1; + *open_flags |= _O_EXCL; + break; +#endif case 'D': *open_flags |= _O_TEMPORARY; break; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c2b6dc18d28..a91ea6c98b8 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1539,6 +1539,54 @@ static void test_fenv(void) ok(!except, "expected 0, got %lx\n", except); } +static void test_fopen_exclusive( void ) +{ + char path[MAX_PATH*2]; + DWORD len; + FILE *fp; + + if (!GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "__std_terminate")) + { + win_skip("skipping fopen x mode tests.\n"); + return; + } + + len = GetTempPathA(MAX_PATH, path); + ok(len, "GetTempPathA failed\n"); + strcat(path, "\\fileexcl.tst"); + + fp = fopen(path, "wx"); + ok(fp != NULL, "creating file with mode wx failed\n"); + fclose(fp); + + fp = fopen(path, "wx"); + ok(!fp, "overwrote existing file with mode wx\n"); + unlink(path); + + fp = fopen(path, "w+x"); + ok(fp != NULL, "creating file with mode w+x failed\n"); + fclose(fp); + + fp = fopen(path, "w+x"); + ok(!fp, "overwrote existing file with mode w+x\n"); + + SET_EXPECT(global_invalid_parameter_handler); + fp = fopen(path, "rx"); + CHECK_CALLED(global_invalid_parameter_handler); + ok(!fp, "opening file with mode rx succeeded\n"); + unlink(path); + + SET_EXPECT(global_invalid_parameter_handler); + fp = fopen(path, "xw"); + CHECK_CALLED(global_invalid_parameter_handler); + ok(!fp, "creating file with mode xw succeeded\n"); + + fp = fopen(path, "wbx"); + ok(fp != NULL, "creating file with mode wx failed\n"); + fclose(fp); + unlink(path); +} + START_TEST(misc) { int arg_c; @@ -1580,4 +1628,5 @@ START_TEST(misc) test_clock(); test_thread_storage(); test_fenv(); + test_fopen_exclusive(); }

1 0