Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com ---
This patchset fixes the Zoo Tycoon 2 demo. Reported here: https://bugs.winehq.org/show_bug.cgi?id=26851#c14
dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcrt/data.c | 7 +++++++ dlls/msvcrt/msvcrt.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index dd80131464..55738a00bf 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -558,7 +558,7 @@ @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected -@ stub _get_winmajor +@ cdecl _get_winmajor(ptr) _get_winmajor @ stub _get_winminor @ stub _get_winver @ cdecl _get_wpgmptr(ptr) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 5de80f419a..39f64539c6 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -746,3 +746,10 @@ MSVCRT_wchar_t* CDECL _get_wide_winmain_command_line(void)
return wide_command_line = s; } + +int CDECL _get_winmajor(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__winmajor; + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2f20699d3b..8a88a51fcf 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -513,7 +513,7 @@ @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() # stub _get_wenviron(ptr) -# stub _get_winmajor(ptr) +@ cdecl _get_winmajor(ptr) _get_winmajor # stub _get_winminor(ptr) # stub _get_winver(ptr) @ cdecl _get_wpgmptr(ptr)
Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcrt/data.c | 7 +++++++ dlls/msvcrt/msvcrt.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 55738a00bf..8b34047514 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -559,7 +559,7 @@ @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected @ cdecl _get_winmajor(ptr) _get_winmajor -@ stub _get_winminor +@ cdecl _get_winminor(ptr) _get_winminor @ stub _get_winver @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 39f64539c6..4a64e4afbb 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -753,3 +753,10 @@ int CDECL _get_winmajor(int* value) *value = MSVCRT__winmajor; return 0; } + +int CDECL _get_winminor(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__winminor; + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8a88a51fcf..3ab1329582 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -514,7 +514,7 @@ @ cdecl _get_sbh_threshold() # stub _get_wenviron(ptr) @ cdecl _get_winmajor(ptr) _get_winmajor -# stub _get_winminor(ptr) +@ cdecl _get_winminor(ptr) _get_winminor # stub _get_winver(ptr) @ cdecl _get_wpgmptr(ptr) @ cdecl _get_terminate() MSVCRT__get_terminate
Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcrt/data.c | 7 +++++++ dlls/msvcrt/msvcrt.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8b34047514..f614eb4fbd 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -548,7 +548,7 @@ @ cdecl _get_invalid_parameter_handler() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform -@ stub _get_osver +@ cdecl _get_osver(ptr) _get_osver @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 4a64e4afbb..5ab85d053e 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -760,3 +760,10 @@ int CDECL _get_winminor(int* value) *value = MSVCRT__winminor; return 0; } + +int CDECL _get_osver(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__osver; + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3ab1329582..5406900e8d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -508,7 +508,7 @@ @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform -# stub _get_osver(ptr) +@ cdecl _get_osver(ptr) _get_osver @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold()
-
Gijs Vermeulen