[PATCH 1/3] msvcrt: Add _get_winmajor.

Gijs Vermeulen gijsvrm at gmail.com
Mon Dec 25 15:44:45 CST 2017


Signed-off-by: Gijs Vermeulen <gijsvrm at 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)
-- 
2.14.3 (Apple Git-98)




More information about the wine-devel mailing list