wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Zebediah Figura : tests: Load libvulkan dynamically in vkd3d_api.c.
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: vkd3d Branch: master Commit: bcad6d6997168cde9e901c806ad78296516fdd18 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bcad6d6997168cde9e901c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 18 20:28:44 2022 -0500 tests: Load libvulkan dynamically in vkd3d_api.c. We would like to allow overriding the soname of libvulkan, in which case the tests and demos should respect that override. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- tests/vkd3d_api.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ed881ffa..3079a0df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -314,7 +314,7 @@ tests_shader_runner_SOURCES = \ tests/shader_runner.c \ tests/shader_runner_d3d12.c \ tests/shader_runner_vulkan.c -tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ +tests_vkd3d_api_LDADD = libvkd3d.la @DL_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner XFAIL_TESTS = \ diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 8195c067..ab266c4b 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define VK_NO_PROTOTYPES #define COBJMACROS #define INITGUID #define WIDL_C_INLINE_WRAPPERS @@ -24,6 +25,13 @@ #include "d3d12_test_utils.h" +#define DECLARE_VK_PFN(name) static PFN_##name name; +DECLARE_VK_PFN(vkEnumerateInstanceExtensionProperties) +DECLARE_VK_PFN(vkGetInstanceProcAddr) +#define VK_INSTANCE_PFN DECLARE_VK_PFN +#define VK_DEVICE_PFN DECLARE_VK_PFN +#include "vulkan_procs.h" + HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) { @@ -1180,6 +1188,21 @@ static bool have_d3d12_device(void) START_TEST(vkd3d_api) { + void *libvulkan; + + if (!(libvulkan = vkd3d_dlopen(SONAME_LIBVULKAN))) + { + skip("Failed to load %s: %s.\n", SONAME_LIBVULKAN, vkd3d_dlerror()); + return; + } + +#define LOAD_VK_PFN(name) name = vkd3d_dlsym(libvulkan, #name); +LOAD_VK_PFN(vkEnumerateInstanceExtensionProperties) +LOAD_VK_PFN(vkGetInstanceProcAddr) +#define VK_DEVICE_PFN LOAD_VK_PFN +#define VK_INSTANCE_PFN LOAD_VK_PFN +#include "vulkan_procs.h" + if (!have_d3d12_device()) { skip("D3D12 device cannot be created.\n");

1 0

Zebediah Figura : include: Implement vkd3d_dl*() wrappers for Win32 platforms.
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: vkd3d Branch: master Commit: d087b9ea5b4fffcd03e3c4925c2eb83ab8d1f39e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d087b9ea5b4fffcd03e3c49… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 18 20:28:42 2022 -0500 include: Implement vkd3d_dl*() wrappers for Win32 platforms. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 7aabe8ab..c041b52d 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -27,6 +27,7 @@ #include <limits.h> #include <stdbool.h> #include <stdint.h> +#include <stdio.h> #ifdef _MSC_VER #include <intrin.h> @@ -246,7 +247,33 @@ static inline void vkd3d_parse_version(const char *version, int *major, int *min HRESULT hresult_from_vkd3d_result(int vkd3d_result); -#ifdef HAVE_DLFCN_H +#ifdef _WIN32 +static inline void *vkd3d_dlopen(const char *name) +{ + return LoadLibraryA(name); +} + +static inline void *vkd3d_dlsym(void *handle, const char *symbol) +{ + return GetProcAddress(handle, symbol); +} + +static inline int vkd3d_dlclose(void *handle) +{ + return FreeLibrary(handle); +} + +static inline const char *vkd3d_dlerror(void) +{ + unsigned int error = GetLastError(); + static char message[256]; + + if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, message, sizeof(message), NULL)) + return message; + sprintf(message, "Unknown error %u.\n", error); + return message; +} +#elif defined(HAVE_DLFCN_H) #include <dlfcn.h> static inline void *vkd3d_dlopen(const char *name)

1 0

Zebediah Figura : include: Move vkd3d_dl*() helpers to vkd3d_common.h.
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: vkd3d Branch: master Commit: a58e713314486521d990c5aef619df3a5db34067 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a58e713314486521d990c5a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 18 20:28:41 2022 -0500 include: Move vkd3d_dl*() helpers to vkd3d_common.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 44 +++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/device.c | 45 ------------------------------------------ 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 11acc643..7aabe8ab 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -246,4 +246,48 @@ static inline void vkd3d_parse_version(const char *version, int *major, int *min HRESULT hresult_from_vkd3d_result(int vkd3d_result); +#ifdef HAVE_DLFCN_H +#include <dlfcn.h> + +static inline void *vkd3d_dlopen(const char *name) +{ + return dlopen(name, RTLD_NOW); +} + +static inline void *vkd3d_dlsym(void *handle, const char *symbol) +{ + return dlsym(handle, symbol); +} + +static inline int vkd3d_dlclose(void *handle) +{ + return dlclose(handle); +} + +static inline const char *vkd3d_dlerror(void) +{ + return dlerror(); +} +#else +static inline void *vkd3d_dlopen(const char *name) +{ + return NULL; +} + +static inline void *vkd3d_dlsym(void *handle, const char *symbol) +{ + return NULL; +} + +static inline int vkd3d_dlclose(void *handle) +{ + return 0; +} + +static inline const char *vkd3d_dlerror(void) +{ + return "Not implemented for this platform.\n"; +} +#endif + #endif /* __VKD3D_COMMON_H */ diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ab087d60..0b643727 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -19,51 +19,6 @@ #include "vkd3d_private.h" #include "vkd3d_version.h" -#ifdef HAVE_DLFCN_H -#include <dlfcn.h> - -static void *vkd3d_dlopen(const char *name) -{ - return dlopen(name, RTLD_NOW); -} - -static void *vkd3d_dlsym(void *handle, const char *symbol) -{ - return dlsym(handle, symbol); -} - -static int vkd3d_dlclose(void *handle) -{ - return dlclose(handle); -} - -static const char *vkd3d_dlerror(void) -{ - return dlerror(); -} -#else -static void *vkd3d_dlopen(const char *name) -{ - FIXME("Not implemented for this platform.\n"); - return NULL; -} - -static void *vkd3d_dlsym(void *handle, const char *symbol) -{ - return NULL; -} - -static int vkd3d_dlclose(void *handle) -{ - return 0; -} - -static const char *vkd3d_dlerror(void) -{ - return "Not implemented for this platform.\n"; -} -#endif - struct vkd3d_struct { enum vkd3d_structure_type type;

1 0

Francois Gouget : testbot/web: Use GenerateDataView() for the users list.
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: tools Branch: master Commit: aee314fddcdda8d6c2f5ef2cdb30ded744fdd8d6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=aee314fddcdda8d6c2f5ef2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 20 16:16:12 2022 +0200 testbot/web: Use GenerateDataView() for the users list. There is no need to override GenerateDataCell(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/UsersList.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 368a6ce..dcdb811 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -45,7 +45,7 @@ sub DisplayProperty($$) return $PropertyName =~ /^(?:Name|EMail|Status|RealName)$/ ? "ro" : ""; } -sub GenerateDataCell($$$) +sub GenerateDataView($$$) { my ($self, $Row, $PropertyDescriptor) = @_; @@ -83,11 +83,11 @@ sub GenerateDataCell($$$) ($Class, $Label) = ('usernone', 'none'); } my $DetailsLink = $self->GetDetailsLink($Row); - print "<td><a href='$DetailsLink'><span class='$Class'>$Label</span></a></td>"; + print "<a href='$DetailsLink'><span class='$Class'>$Label</span></a>"; } else { - $self->SUPER::GenerateDataCell($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); } }

1 0

Francois Gouget : testbot/web: Simplify the job details page DisplayProperty().
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: tools Branch: master Commit: 940241aced8ee868903a5d57b15e55cb9f870281 URL: https://source.winehq.org/git/tools.git/?a=commit;h=940241aced8ee868903a5d5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 20 16:17:18 2022 +0200 testbot/web: Simplify the job details page DisplayProperty(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index f681ca5..e39df41 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -49,7 +49,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:StepNo|TaskNo|Status|VM|Timeout|FileName|CmdLineArg|Started|Ended|TestFailures)$/ ? "ro" : ""; + return $PropertyName =~ /^(?:Id|PreviousNo|Type|FileType|Missions)$/ ? "" : + $self->SUPER::DisplayProperty($PropertyDescriptor); }

1 0

Francois Gouget : testbot/web: Always return "ro" or false in CollectionBlock::DisplayProperty().
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: tools Branch: master Commit: d12eb5049c87183b3bc33c917b6b0d2f37f83c65 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d12eb5049c87183b3bc33c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 20 16:17:16 2022 +0200 testbot/web: Always return "ro" or false in CollectionBlock::DisplayProperty(). This better matches FormPage::DisplayProperty() and opens the door to later extending collection blocks to support edition. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- testbot/web/JobDetails.pl | 6 +----- testbot/web/PatchesList.pl | 5 ++--- testbot/web/admin/UsersList.pl | 3 +-- testbot/web/admin/VMDetails.pl | 4 ++-- testbot/web/admin/VMsList.pl | 5 ++--- testbot/web/index.pl | 5 ++--- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 958cfec..e849d5a 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -179,7 +179,7 @@ sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; - return $PropertyDescriptor->GetClass ne "Detailref"; + return $PropertyDescriptor->GetClass eq "Detailref" ? "" : "ro"; } sub GetSortedItems($$) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 2c7901a..f681ca5 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -49,11 +49,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "StepNo" || $PropertyName eq "TaskNo" || - $PropertyName eq "Status" || $PropertyName eq "VM" || - $PropertyName eq "Timeout" || $PropertyName eq "FileName" || - $PropertyName eq "CmdLineArg" || $PropertyName eq "Started" || - $PropertyName eq "Ended" || $PropertyName eq "TestFailures"; + return $PropertyName =~ /^(?:StepNo|TaskNo|Status|VM|Timeout|FileName|CmdLineArg|Started|Ended|TestFailures)$/ ? "ro" : ""; } diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 48c8382..a1c5171 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -40,9 +40,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - - return $PropertyName eq "Received" || $PropertyName eq "Disposition" || - $PropertyName eq "FromName" || $PropertyName eq "Subject"; + return $PropertyName =~ /^(?:Received|Disposition|FromName|Subject)$/ ? "ro" : + ""; } sub GenerateDataView($$$) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index bc5ced8..368a6ce 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -42,8 +42,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "EMail" || - $PropertyName eq "Status" || $PropertyName eq "RealName"; + return $PropertyName =~ /^(?:Name|EMail|Status|RealName)$/ ? "ro" : ""; } sub GenerateDataCell($$$) diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 35b2681..fd2d40d 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -40,8 +40,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline|Errors)$/); - return $self->SUPER::DisplayProperty($PropertyDescriptor); + return $PropertyName =~ /^(?:ChildPid|ChildDeadline|Errors)$/ ? "" : + $self->SUPER::DisplayProperty($PropertyDescriptor); } sub Save($) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index f8162c6..6c3ff20 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -38,9 +38,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "Type" || - $PropertyName eq "Role" || $PropertyName eq "Status" || - $PropertyName eq "Description"; + return $PropertyName =~ /^(?:Name|Type|Role|Status|Description)$/ ? "ro" : + ""; } sub OnItemAction($$$) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index a189205..0b8a9cb 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -183,9 +183,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "Type" || - $PropertyName eq "Role" || $PropertyName eq "Status" || - $PropertyName eq "Description"; + return $PropertyName =~ /^(?:Name|Type|Role|Status|Description)$/ ? "ro" : + ""; }

1 0

Francois Gouget : testbot/cgi: Fix the CollectionBlock::GenerateHeaderRow() prototype.
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: tools Branch: master Commit: 54a5aab7c2f3724711106ef5b71c7be07afa4376 URL: https://source.winehq.org/git/tools.git/?a=commit;h=54a5aab7c2f3724711106ef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 20 16:17:03 2022 +0200 testbot/cgi: Fix the CollectionBlock::GenerateHeaderRow() prototype. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index d425622..958cfec 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -336,7 +336,7 @@ sub GenerateHeaderCell($$$) print "</th>\n"; } -sub GenerateHeaderRow($$$) +sub GenerateHeaderRow($$) { my ($self, $Row) = @_;

1 0

Francois Gouget : testbot/web: Simplify the register page's DisplayProperty().
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: tools Branch: master Commit: a889402d89934a2155b0cdd0502ddc82e94593df URL: https://source.winehq.org/git/tools.git/?a=commit;h=a889402d89934a2155b0cdd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 20 16:16:34 2022 +0200 testbot/web: Simplify the register page's DisplayProperty(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Register.pl | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index b10be75..b31dc14 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -79,15 +79,9 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - - my $Display; - if ($PropertyName ne "Name" && $PropertyName ne "EMail" && - $PropertyName ne "RealName") - { - return ""; - } - - return $self->SUPER::DisplayProperty($PropertyDescriptor); + return $PropertyName =~ /^(?:Name|EMail|RealName)$/ ? + $self->SUPER::DisplayProperty($PropertyDescriptor) : + ""; } sub GenerateFields($)

1 0

Francois Gouget : testbot/cgi: Fix the CollectionBlock::GenerateHeaderView() documentation.
by Alexandre Julliard 20 Apr '22

20 Apr '22

Module: tools Branch: master Commit: 0dbb766f0a16f5fc133611cf87626dbae11eaffc URL: https://source.winehq.org/git/tools.git/?a=commit;h=0dbb766f0a16f5fc133611c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 20 16:16:20 2022 +0200 testbot/cgi: Fix the CollectionBlock::GenerateHeaderView() documentation. The Row and Rows fields were undocumented and there was a bug in the POD formatting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 3e3ee29..d425622 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -241,7 +241,13 @@ The base link to the item details page if any. See GetDetailsPage(). =item ItemActions The list of per-item actions. -=cut +=item Row +The row index; 0 for the header. + +=item Rows +The total number of rows (excluding the header). + +=back =back =cut

1 0

Rémi Bernon : ntdll: Fix main heap struct layout and flags members.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 43fe980818d93e8f407eb6447aaf7eb4381c3cee URL: https://source.winehq.org/git/wine.git/?a=commit;h=43fe980818d93e8f407eb644… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 19 19:33:32 2022 +0200 ntdll: Fix main heap struct layout and flags members. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 3 -- dlls/ntdll/heap.c | 72 +++++++++++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index e1cda94f78c..104eced3bf4 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1974,9 +1974,7 @@ static void test_heap_layout( HANDLE handle, DWORD global_flag, DWORD heap_flags if (global_flag & FLG_HEAP_ENABLE_TAGGING) heap_flags |= HEAP_SHARED; if (!(global_flag & FLG_HEAP_PAGE_ALLOCS)) force_flags &= ~(HEAP_GROWABLE|HEAP_PRIVATE); - todo_wine_if( force_flags & (HEAP_PRIVATE|HEAP_NO_SERIALIZE) ) ok( heap->force_flags == force_flags, "got force_flags %#x\n", heap->force_flags ); - todo_wine_if( heap_flags & (HEAP_VALIDATE_ALL|HEAP_VALIDATE_PARAMS|HEAP_SHARED|HEAP_PRIVATE) ) ok( heap->flags == heap_flags, "got flags %#x\n", heap->flags ); if (heap->flags & HEAP_PAGE_ALLOCS) @@ -1990,7 +1988,6 @@ static void test_heap_layout( HANDLE handle, DWORD global_flag, DWORD heap_flags } else { - todo_wine ok( heap->ffeeffee == 0xffeeffee, "got ffeeffee %#x\n", heap->ffeeffee ); ok( heap->auto_flags == (heap_flags & HEAP_GROWABLE) || !heap->auto_flags, "got auto_flags %#x\n", heap->auto_flags ); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 01364016271..298c39f24ff 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -142,17 +142,17 @@ typedef struct tagSUBHEAP #define SUBHEAP_MAGIC ((DWORD)('S' | ('U'<<8) | ('B'<<16) | ('H'<<24))) typedef struct tagHEAP -{ - DWORD_PTR unknown1[2]; - DWORD unknown2[2]; - DWORD_PTR unknown3[4]; - DWORD unknown4; - DWORD_PTR unknown5[2]; - DWORD unknown6[3]; - DWORD_PTR unknown7[2]; - /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ - DWORD flags; /* Heap flags */ - DWORD force_flags; /* Forced heap flags for debugging */ +{ /* win32/win64 */ + DWORD_PTR unknown1[2]; /* 0000/0000 */ + DWORD ffeeffee; /* 0008/0010 */ + DWORD auto_flags; /* 000c/0014 */ + DWORD_PTR unknown2[7]; /* 0010/0018 */ + DWORD unknown3[2]; /* 002c/0050 */ + DWORD_PTR unknown4[3]; /* 0034/0058 */ + DWORD flags; /* 0040/0070 */ + DWORD force_flags; /* 0044/0074 */ + /* end of the Windows 10 compatible struct layout */ + BOOL shared; /* System shared heap */ SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ @@ -173,6 +173,7 @@ typedef struct tagHEAP #define MAX_FREE_PENDING 1024 /* max number of free requests to delay */ /* some undocumented flags (names are made up) */ +#define HEAP_PRIVATE 0x00001000 #define HEAP_PAGE_ALLOCS 0x01000000 #define HEAP_VALIDATE 0x10000000 #define HEAP_VALIDATE_ALL 0x20000000 @@ -922,7 +923,9 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* If this is a primary subheap, initialize main heap */ heap = address; - heap->flags = flags; + heap->ffeeffee = 0xffeeffee; + heap->auto_flags = (flags & HEAP_GROWABLE); + heap->flags = (flags & ~HEAP_SHARED); heap->shared = (flags & HEAP_SHARED) != 0; heap->magic = HEAP_MAGIC; heap->grow_size = max( HEAP_DEF_SIZE, totalSize ); @@ -1438,6 +1441,25 @@ static BOOL validate_block_pointer( HEAP *heap, SUBHEAP **ret_subheap, const ARE return ret; } +static DWORD heap_flags_from_global_flag( DWORD flag ) +{ + DWORD ret = 0; + + if (flag & FLG_HEAP_ENABLE_TAIL_CHECK) + ret |= HEAP_TAIL_CHECKING_ENABLED; + if (flag & FLG_HEAP_ENABLE_FREE_CHECK) + ret |= HEAP_FREE_CHECKING_ENABLED; + if (flag & FLG_HEAP_VALIDATE_PARAMETERS) + ret |= HEAP_VALIDATE_PARAMS | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (flag & FLG_HEAP_VALIDATE_ALL) + ret |= HEAP_VALIDATE_ALL | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (flag & FLG_HEAP_DISABLE_COALESCING) + ret |= HEAP_DISABLE_COALESCE_ON_FREE; + if (flag & FLG_HEAP_PAGE_ALLOCS) + ret |= HEAP_PAGE_ALLOCS; + + return ret; +} /*********************************************************************** * heap_set_debug_flags @@ -1446,27 +1468,21 @@ static void heap_set_debug_flags( HANDLE handle ) { HEAP *heap = HEAP_GetPtr( handle ); ULONG global_flags = RtlGetNtGlobalFlags(); - ULONG flags = 0; + DWORD flags, force_flags; if (TRACE_ON(heap)) global_flags |= FLG_HEAP_VALIDATE_ALL; if (WARN_ON(heap)) global_flags |= FLG_HEAP_VALIDATE_PARAMETERS; - if (global_flags & FLG_HEAP_ENABLE_TAIL_CHECK) flags |= HEAP_TAIL_CHECKING_ENABLED; - if (global_flags & FLG_HEAP_ENABLE_FREE_CHECK) flags |= HEAP_FREE_CHECKING_ENABLED; - if (global_flags & FLG_HEAP_DISABLE_COALESCING) flags |= HEAP_DISABLE_COALESCE_ON_FREE; - if (global_flags & FLG_HEAP_PAGE_ALLOCS) flags |= HEAP_PAGE_ALLOCS | HEAP_GROWABLE; + flags = heap_flags_from_global_flag( global_flags ); + force_flags = (heap->flags | flags) & ~(HEAP_SHARED|HEAP_DISABLE_COALESCE_ON_FREE); - if (global_flags & FLG_HEAP_VALIDATE_PARAMETERS) - flags |= HEAP_VALIDATE | HEAP_VALIDATE_PARAMS | - HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; - if (global_flags & FLG_HEAP_VALIDATE_ALL) - flags |= HEAP_VALIDATE | HEAP_VALIDATE_ALL | - HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (global_flags & FLG_HEAP_ENABLE_TAGGING) flags |= HEAP_SHARED; + if (!(global_flags & FLG_HEAP_PAGE_ALLOCS)) force_flags &= ~(HEAP_GROWABLE|HEAP_PRIVATE); if (RUNNING_ON_VALGRIND) flags = 0; /* no sense in validating since Valgrind catches accesses */ heap->flags |= flags; - heap->force_flags |= flags & ~(HEAP_VALIDATE | HEAP_DISABLE_COALESCE_ON_FREE); + heap->force_flags |= force_flags; if (flags & (HEAP_FREE_CHECKING_ENABLED | HEAP_TAIL_CHECKING_ENABLED)) /* fix existing blocks */ { @@ -1541,11 +1557,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c /* Allocate the heap block */ - if (!totalSize) - { - totalSize = HEAP_DEF_SIZE; - flags |= HEAP_GROWABLE; - } + if (processHeap) flags |= HEAP_PRIVATE; + if (!processHeap || !totalSize || (flags & HEAP_SHARED)) flags |= HEAP_GROWABLE; + if (!totalSize) totalSize = HEAP_DEF_SIZE; if (!(subheap = HEAP_CreateSubHeap( NULL, addr, flags, commitSize, totalSize ))) return 0;

1 0

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 April 2022