Hugh McMaster : msvcrt: Implement _wperror.
Alexandre Julliard
julliard at winehq.org
Wed Jun 22 11:04:41 CDT 2016
Module: wine
Branch: master
Commit: 56eb4d3105733693f8de43eacf8e20ed922cb65a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=56eb4d3105733693f8de43eacf8e20ed922cb65a
Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date: Wed Jun 22 01:53:00 2016 +0000
msvcrt: Implement _wperror.
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcr100/msvcr100.spec | 2 +-
dlls/msvcr110/msvcr110.spec | 2 +-
dlls/msvcr120/msvcr120.spec | 2 +-
dlls/msvcr70/msvcr70.spec | 2 +-
dlls/msvcr71/msvcr71.spec | 2 +-
dlls/msvcr80/msvcr80.spec | 2 +-
dlls/msvcr90/msvcr90.spec | 2 +-
dlls/msvcrt/errno.c | 25 +++++++++++++++++++++++++
dlls/msvcrt/msvcrt.spec | 2 +-
dlls/ucrtbase/ucrtbase.spec | 2 +-
10 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index efbd688..5fae918 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1568,7 +1568,7 @@
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
-@ stub _wperror(wstr)
+@ cdecl _wperror(wstr) MSVCRT__wperror
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ stub _wprintf_l
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 7476995..38fdfe9 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1925,7 +1925,7 @@
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
-@ stub _wperror(wstr)
+@ cdecl _wperror(wstr) MSVCRT__wperror
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ stub _wprintf_l
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 7aa2d19..4ef7358 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -1949,7 +1949,7 @@
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
-@ stub _wperror(wstr)
+@ cdecl _wperror(wstr) MSVCRT__wperror
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ stub _wprintf_l
diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index f236db5..6bd5083 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -641,7 +641,7 @@
@ cdecl _wmkdir(wstr) MSVCRT__wmkdir
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ varargs _wopen(wstr long) MSVCRT__wopen
-@ stub _wperror(wstr)
+@ cdecl _wperror(wstr) MSVCRT__wperror
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ cdecl _wputenv(wstr)
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index 5414dc6..7e3f265 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -637,7 +637,7 @@
@ cdecl _wmkdir(wstr) MSVCRT__wmkdir
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ varargs _wopen(wstr long) MSVCRT__wopen
-@ stub _wperror(wstr)
+@ cdecl _wperror(wstr) MSVCRT__wperror
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ cdecl _wputenv(wstr)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index a6f0a90..1c1dc1a 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -1250,7 +1250,7 @@
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
-@ stub _wperror(wstr)
+@ cdecl _wperror(wstr) MSVCRT__wperror
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ stub _wprintf_l
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 48aed2c..13d1bab 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -1223,7 +1223,7 @@
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
-@ stub _wperror(wstr)
+@ cdecl _wperror(wstr) MSVCRT__wperror
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ stub _wprintf_l
diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c
index 641ca35..46b1859 100644
--- a/dlls/msvcrt/errno.c
+++ b/dlls/msvcrt/errno.c
@@ -344,6 +344,31 @@ void CDECL MSVCRT_perror(const char* str)
}
/*********************************************************************
+ * _wperror (MSVCRT.@)
+ */
+void CDECL MSVCRT__wperror(const MSVCRT_wchar_t* str)
+{
+ MSVCRT_size_t size;
+ char *buffer = NULL;
+
+ if (str && *str)
+ {
+ size = MSVCRT_wcstombs(NULL, str, 0);
+ if (size == -1) return;
+ size++;
+ buffer = MSVCRT_malloc(size);
+ if (!buffer) return;
+ if (MSVCRT_wcstombs(buffer, str, size) == -1)
+ {
+ MSVCRT_free(buffer);
+ return;
+ }
+ }
+ MSVCRT_perror(buffer);
+ if (buffer) MSVCRT_free(buffer);
+}
+
+/*********************************************************************
* _wcserror_s (MSVCRT.@)
*/
int CDECL MSVCRT__wcserror_s(MSVCRT_wchar_t* buffer, MSVCRT_size_t nc, int err)
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 37107d5..274d2e7 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -1184,7 +1184,7 @@
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
# stub _woutput_s
-@ stub _wperror(wstr)
+@ cdecl _wperror(wstr) MSVCRT__wperror
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen (wstr wstr) MSVCRT__wpopen
# stub _wprintf_l(wstr ptr)
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index da03fd1..ecfb612 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -2097,7 +2097,7 @@
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
-@ stub _wperror(wstr)
+@ cdecl _wperror(wstr) MSVCRT__wperror
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ cdecl _wputenv(wstr)
@ cdecl _wputenv_s(wstr wstr)
More information about the wine-cvs
mailing list