mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Updated vcomp_for_dynamic_init_i8 patchset
run make_specfiles to ensure all files are correct.
This commit is contained in:
Alistair Leslie-Hughes
parent
1c14122a2d
commit
e175b3e173
@ -1,19 +1,24 @@
|
||||
From 84aac220084db0058e68e5800992842179fef4f6 Mon Sep 17 00:00:00 2001
|
||||
From 4274d901461697a7fb05b0d1e0b06216061166f1 Mon Sep 17 00:00:00 2001
|
||||
From: Ben Shefte <shefben@gmail.com>
|
||||
Date: Wed, 1 Mar 2023 07:37:52 +1100
|
||||
Subject: [PATCH] vcomp: Implement _vcomp_for_dynamic_init_i8
|
||||
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52012
|
||||
---
|
||||
dlls/vcomp/main.c | 135 ++++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/vcomp/vcomp.spec | 6 +-
|
||||
2 files changed, 138 insertions(+), 3 deletions(-)
|
||||
dlls/vcomp/main.c | 135 ++++++++++++++++++++++++++++++++++++
|
||||
dlls/vcomp/vcomp.spec | 6 +-
|
||||
dlls/vcomp100/vcomp100.spec | 6 +-
|
||||
dlls/vcomp110/vcomp110.spec | 6 +-
|
||||
dlls/vcomp120/vcomp120.spec | 6 +-
|
||||
dlls/vcomp140/vcomp140.spec | 6 +-
|
||||
dlls/vcomp90/vcomp90.spec | 6 +-
|
||||
7 files changed, 153 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c
|
||||
index 374adf3991a..faa863d3ea4 100644
|
||||
index 63ec0502b9b..4cde0381693 100644
|
||||
--- a/dlls/vcomp/main.c
|
||||
+++ b/dlls/vcomp/main.c
|
||||
@@ -1031,6 +1031,26 @@ double CDECL omp_get_wtime(void)
|
||||
@@ -1034,6 +1034,26 @@ double CDECL omp_get_wtime(void)
|
||||
return GetTickCount() / 1000.0;
|
||||
}
|
||||
|
||||
@ -40,7 +45,7 @@ index 374adf3991a..faa863d3ea4 100644
|
||||
void CDECL omp_set_dynamic(int val)
|
||||
{
|
||||
TRACE("(%d): stub\n", val);
|
||||
@@ -1483,6 +1503,77 @@ void CDECL _vcomp_for_dynamic_init(unsigned int flags, unsigned int first, unsig
|
||||
@@ -1486,6 +1506,77 @@ void CDECL _vcomp_for_dynamic_init(unsigned int flags, unsigned int first, unsig
|
||||
}
|
||||
}
|
||||
|
||||
@ -118,7 +123,7 @@ index 374adf3991a..faa863d3ea4 100644
|
||||
int CDECL _vcomp_for_dynamic_next(unsigned int *begin, unsigned int *end)
|
||||
{
|
||||
struct vcomp_thread_data *thread_data = vcomp_init_thread_data();
|
||||
@@ -1527,6 +1618,50 @@ int CDECL _vcomp_for_dynamic_next(unsigned int *begin, unsigned int *end)
|
||||
@@ -1530,6 +1621,50 @@ int CDECL _vcomp_for_dynamic_next(unsigned int *begin, unsigned int *end)
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -194,6 +199,131 @@ index fb67146e058..09bf45550d5 100644
|
||||
@ cdecl omp_get_wtime()
|
||||
@ cdecl omp_in_parallel()
|
||||
@ cdecl omp_init_lock(ptr)
|
||||
diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec
|
||||
index fb67146e058..9aa43e3ba4b 100644
|
||||
--- a/dlls/vcomp100/vcomp100.spec
|
||||
+++ b/dlls/vcomp100/vcomp100.spec
|
||||
@@ -56,9 +56,9 @@
|
||||
@ cdecl _vcomp_enter_critsect(ptr)
|
||||
@ cdecl _vcomp_flush()
|
||||
@ cdecl _vcomp_for_dynamic_init(long long long long long)
|
||||
-@ stub _vcomp_for_dynamic_init_i8
|
||||
+@ cdecl -arch=win64 _vcomp_for_dynamic_init_i8(int64 int64 int64 int64 int64) vcomp._vcomp_for_dynamic_init_i8
|
||||
@ cdecl _vcomp_for_dynamic_next(ptr ptr)
|
||||
-@ stub _vcomp_for_dynamic_next_i8
|
||||
+@ cdecl -arch=win64 _vcomp_for_dynamic_next_i8(ptr ptr) vcomp._vcomp_for_dynamic_next_i8
|
||||
@ cdecl _vcomp_for_static_end()
|
||||
@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr)
|
||||
@ cdecl _vcomp_for_static_init_i8(int64 int64 int64 int64 ptr ptr ptr ptr ptr)
|
||||
@@ -96,7 +96,7 @@
|
||||
@ cdecl omp_get_num_procs()
|
||||
@ cdecl omp_get_num_threads()
|
||||
@ cdecl omp_get_thread_num()
|
||||
-@ stub omp_get_wtick
|
||||
+@ cdecl omp_get_wtick() vcomp.omp_get_wtick
|
||||
@ cdecl omp_get_wtime()
|
||||
@ cdecl omp_in_parallel()
|
||||
@ cdecl omp_init_lock(ptr)
|
||||
diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec
|
||||
index e1cb8ab9931..d8b4d3e3f16 100644
|
||||
--- a/dlls/vcomp110/vcomp110.spec
|
||||
+++ b/dlls/vcomp110/vcomp110.spec
|
||||
@@ -57,9 +57,9 @@
|
||||
@ cdecl _vcomp_enter_critsect(ptr)
|
||||
@ cdecl _vcomp_flush()
|
||||
@ cdecl _vcomp_for_dynamic_init(long long long long long)
|
||||
-@ stub _vcomp_for_dynamic_init_i8
|
||||
+@ cdecl -arch=win64 _vcomp_for_dynamic_init_i8(int64 int64 int64 int64 int64) vcomp._vcomp_for_dynamic_init_i8
|
||||
@ cdecl _vcomp_for_dynamic_next(ptr ptr)
|
||||
-@ stub _vcomp_for_dynamic_next_i8
|
||||
+@ cdecl -arch=win64 _vcomp_for_dynamic_next_i8(ptr ptr) vcomp._vcomp_for_dynamic_next_i8
|
||||
@ cdecl _vcomp_for_static_end()
|
||||
@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr)
|
||||
@ cdecl _vcomp_for_static_init_i8(int64 int64 int64 int64 ptr ptr ptr ptr ptr)
|
||||
@@ -97,7 +97,7 @@
|
||||
@ cdecl omp_get_num_procs()
|
||||
@ cdecl omp_get_num_threads()
|
||||
@ cdecl omp_get_thread_num()
|
||||
-@ stub omp_get_wtick
|
||||
+@ cdecl omp_get_wtick() vcomp.omp_get_wtick
|
||||
@ cdecl omp_get_wtime()
|
||||
@ cdecl omp_in_parallel()
|
||||
@ cdecl omp_init_lock(ptr)
|
||||
diff --git a/dlls/vcomp120/vcomp120.spec b/dlls/vcomp120/vcomp120.spec
|
||||
index e1cb8ab9931..d8b4d3e3f16 100644
|
||||
--- a/dlls/vcomp120/vcomp120.spec
|
||||
+++ b/dlls/vcomp120/vcomp120.spec
|
||||
@@ -57,9 +57,9 @@
|
||||
@ cdecl _vcomp_enter_critsect(ptr)
|
||||
@ cdecl _vcomp_flush()
|
||||
@ cdecl _vcomp_for_dynamic_init(long long long long long)
|
||||
-@ stub _vcomp_for_dynamic_init_i8
|
||||
+@ cdecl -arch=win64 _vcomp_for_dynamic_init_i8(int64 int64 int64 int64 int64) vcomp._vcomp_for_dynamic_init_i8
|
||||
@ cdecl _vcomp_for_dynamic_next(ptr ptr)
|
||||
-@ stub _vcomp_for_dynamic_next_i8
|
||||
+@ cdecl -arch=win64 _vcomp_for_dynamic_next_i8(ptr ptr) vcomp._vcomp_for_dynamic_next_i8
|
||||
@ cdecl _vcomp_for_static_end()
|
||||
@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr)
|
||||
@ cdecl _vcomp_for_static_init_i8(int64 int64 int64 int64 ptr ptr ptr ptr ptr)
|
||||
@@ -97,7 +97,7 @@
|
||||
@ cdecl omp_get_num_procs()
|
||||
@ cdecl omp_get_num_threads()
|
||||
@ cdecl omp_get_thread_num()
|
||||
-@ stub omp_get_wtick
|
||||
+@ cdecl omp_get_wtick() vcomp.omp_get_wtick
|
||||
@ cdecl omp_get_wtime()
|
||||
@ cdecl omp_in_parallel()
|
||||
@ cdecl omp_init_lock(ptr)
|
||||
diff --git a/dlls/vcomp140/vcomp140.spec b/dlls/vcomp140/vcomp140.spec
|
||||
index e1cb8ab9931..d8b4d3e3f16 100644
|
||||
--- a/dlls/vcomp140/vcomp140.spec
|
||||
+++ b/dlls/vcomp140/vcomp140.spec
|
||||
@@ -57,9 +57,9 @@
|
||||
@ cdecl _vcomp_enter_critsect(ptr)
|
||||
@ cdecl _vcomp_flush()
|
||||
@ cdecl _vcomp_for_dynamic_init(long long long long long)
|
||||
-@ stub _vcomp_for_dynamic_init_i8
|
||||
+@ cdecl -arch=win64 _vcomp_for_dynamic_init_i8(int64 int64 int64 int64 int64) vcomp._vcomp_for_dynamic_init_i8
|
||||
@ cdecl _vcomp_for_dynamic_next(ptr ptr)
|
||||
-@ stub _vcomp_for_dynamic_next_i8
|
||||
+@ cdecl -arch=win64 _vcomp_for_dynamic_next_i8(ptr ptr) vcomp._vcomp_for_dynamic_next_i8
|
||||
@ cdecl _vcomp_for_static_end()
|
||||
@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr)
|
||||
@ cdecl _vcomp_for_static_init_i8(int64 int64 int64 int64 ptr ptr ptr ptr ptr)
|
||||
@@ -97,7 +97,7 @@
|
||||
@ cdecl omp_get_num_procs()
|
||||
@ cdecl omp_get_num_threads()
|
||||
@ cdecl omp_get_thread_num()
|
||||
-@ stub omp_get_wtick
|
||||
+@ cdecl omp_get_wtick() vcomp.omp_get_wtick
|
||||
@ cdecl omp_get_wtime()
|
||||
@ cdecl omp_in_parallel()
|
||||
@ cdecl omp_init_lock(ptr)
|
||||
diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec
|
||||
index 9fac400ea0e..563f5391ed9 100644
|
||||
--- a/dlls/vcomp90/vcomp90.spec
|
||||
+++ b/dlls/vcomp90/vcomp90.spec
|
||||
@@ -56,9 +56,9 @@
|
||||
@ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect
|
||||
@ cdecl _vcomp_flush() vcomp._vcomp_flush
|
||||
@ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init
|
||||
-@ stub _vcomp_for_dynamic_init_i8
|
||||
+@ cdecl -arch=win64 _vcomp_for_dynamic_init_i8(int64 int64 int64 int64 int64) vcomp._vcomp_for_dynamic_init_i8
|
||||
@ cdecl _vcomp_for_dynamic_next(ptr ptr) vcomp._vcomp_for_dynamic_next
|
||||
-@ stub _vcomp_for_dynamic_next_i8
|
||||
+@ cdecl -arch=win64 _vcomp_for_dynamic_next_i8(ptr ptr) vcomp._vcomp_for_dynamic_next_i8
|
||||
@ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end
|
||||
@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) vcomp._vcomp_for_static_init
|
||||
@ cdecl _vcomp_for_static_init_i8(int64 int64 int64 int64 ptr ptr ptr ptr ptr) vcomp._vcomp_for_static_init_i8
|
||||
@@ -96,7 +96,7 @@
|
||||
@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs
|
||||
@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads
|
||||
@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num
|
||||
-@ stub omp_get_wtick
|
||||
+@ cdecl omp_get_wtick() vcomp.omp_get_wtick
|
||||
@ cdecl omp_get_wtime() vcomp.omp_get_wtime
|
||||
@ cdecl omp_in_parallel() vcomp.omp_in_parallel
|
||||
@ cdecl omp_init_lock(ptr) vcomp.omp_init_lock
|
||||
--
|
||||
2.39.2
|
||||
2.43.0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user