From: Paul Gofman pgofman@codeweavers.com
--- dlls/msvcp140_atomic_wait/main.c | 15 +++++++++++++++ .../msvcp140_atomic_wait.spec | 4 ++-- .../tests/msvcp140_atomic_wait.c | 12 ++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index 76d83d03e7f..30b76522b2c 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -273,3 +273,18 @@ void __stdcall __std_tzdb_delete_current_zone(struct tzdb_current_zone *c) free(c->name); free(c); } + +void * __stdcall __std_tzdb_get_leap_seconds(ULONG_PTR arg1, ULONG_PTR *arg2) +{ + FIXME("(%#Ix %p) stub\n", arg1, arg2); + + *arg2 = 0; + return NULL; +} + +void __stdcall __std_tzdb_delete_leap_seconds(void *l) +{ + TRACE("(%p)\n", l); + + free(l); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 164e562baa8..5d23b217b72 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -22,11 +22,11 @@ @ stdcall __std_release_shared_mutex_for_instance(ptr) @ stdcall __std_submit_threadpool_work(ptr) @ stdcall __std_tzdb_delete_current_zone(ptr) -@ stub __std_tzdb_delete_leap_seconds +@ stdcall __std_tzdb_delete_leap_seconds(ptr) @ stub __std_tzdb_delete_sys_info @ stdcall __std_tzdb_delete_time_zones(ptr) @ stdcall __std_tzdb_get_current_zone() -@ stub __std_tzdb_get_leap_seconds +@ stdcall __std_tzdb_get_leap_seconds(ptr ptr) @ stub __std_tzdb_get_sys_info @ stdcall __std_tzdb_get_time_zones() @ stdcall __std_wait_for_threadpool_work_callbacks(ptr long) diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index 70615e78843..2fa23107674 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -60,6 +60,8 @@ static struct tzdb_time_zones * (__stdcall *p___std_tzdb_get_time_zones)(void); static void (__stdcall *p___std_tzdb_delete_time_zones)(struct tzdb_time_zones *); static struct tzdb_current_zone * (__stdcall *p___std_tzdb_get_current_zone)(void); static void (__stdcall *p___std_tzdb_delete_current_zone)(struct tzdb_current_zone *); +static void * (__stdcall *p___std_tzdb_get_leap_seconds)(ULONG_PTR arg1, ULONG_PTR *); +static void (__stdcall *p___std_tzdb_delete_leap_seconds)(void *);
#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -87,6 +89,8 @@ static HMODULE init(void) SET(p___std_tzdb_delete_time_zones, "__std_tzdb_delete_time_zones"); SET(p___std_tzdb_get_current_zone, "__std_tzdb_get_current_zone"); SET(p___std_tzdb_delete_current_zone, "__std_tzdb_delete_current_zone"); + SET(p___std_tzdb_get_leap_seconds, "__std_tzdb_get_leap_seconds"); + SET(p___std_tzdb_delete_leap_seconds, "__std_tzdb_delete_leap_seconds"); return msvcp; }
@@ -352,7 +356,9 @@ static void test___std_tzdb(void) { struct tzdb_current_zone *c; struct tzdb_time_zones *z; + void *leap_seconds; unsigned int i; + ULONG_PTR arg2;
if (!p___std_tzdb_get_time_zones) { @@ -387,6 +393,12 @@ static void test___std_tzdb(void)
p___std_tzdb_delete_current_zone(c); p___std_tzdb_delete_time_zones(z); + + arg2 = 0xdeadbeef; + leap_seconds = p___std_tzdb_get_leap_seconds(100, &arg2); + ok(!leap_seconds, "got %p.\n", leap_seconds); + ok(!arg2, "got %#Ix.\n", arg2); + p___std_tzdb_delete_leap_seconds(leap_seconds); }
START_TEST(msvcp140_atomic_wait)