[MSVCRT]

- Fix forwarded export of GetLocaleInfoW
- Rename _inp & co to MSVCRT__inp, because they are only available as intrinsics on MSVC
- Implement them using the intrinsic

svn path=/branches/cmake-bringup/; revision=49822

diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec
index 6799425..e915072 100644 (file)
--- a/dll/win32/msvcrt/msvcrt.spec
+++ b/dll/win32/msvcrt/msvcrt.spec
@@ -137,7 +137,7 @@
 @ extern __badioinfo __badioinfo
 @ cdecl __crtCompareStringA(long long str long str long) kernel32.CompareStringA
 @ cdecl __crtCompareStringW(long long wstr long wstr long) kernel32.CompareStringW
-@ cdecl __crtGetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfo
+@ cdecl __crtGetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW
 @ cdecl __crtGetStringTypeW(long long wstr long ptr)
 @ cdecl __crtLCMapStringA(long long str long ptr long long long)
 # stub __crtLCMapStringW
@@ -475,9 +475,9 @@
 # stub _i64tow_s
 @ cdecl _initterm(ptr ptr)
 # stub _initterm_e
-@ cdecl -arch=i386 _inp(long)
-@ cdecl -arch=i386 _inpd(long)
-@ cdecl -arch=i386 _inpw(long)
+@ cdecl -arch=i386 _inp(long) MSVCRT__inp
+@ cdecl -arch=i386 _inpd(long) MSVCRT__inpd
+@ cdecl -arch=i386 _inpw(long) MSVCRT__inpw
 @ cdecl _invalid_parameter(wstr wstr wstr long long)
 @ extern _iob
 # stub _isalnum_l
@@ -757,9 +757,9 @@
 @ cdecl _open_osfhandle(long long)
 @ extern _osplatform _osplatform
 @ extern _osver _osver
-@ cdecl _outp(long long)
-@ cdecl _outpd(long long)
-@ cdecl _outpw(long long)
+@ cdecl _outp(long long) MSVCRT__outp
+@ cdecl _outpd(long long) MSVCRT__outpd
+@ cdecl _outpw(long long) MSVCRT__outpw
 @ cdecl _pclose (ptr)
 @ extern _pctype _pctype
 @ extern _pgmptr _pgmptr

diff --git a/dll/win32/msvcrt/msvcrt_stubs.c b/dll/win32/msvcrt/msvcrt_stubs.c
index 5991a84..ed661a5 100644 (file)
--- a/dll/win32/msvcrt/msvcrt_stubs.c
+++ b/dll/win32/msvcrt/msvcrt_stubs.c
@@ -53,47 +53,43 @@ int _ismbbkprint(
     return 0;
 }
 
-int _inp( 
+
+int MSVCRT__inp( 
    unsigned short port)
 {
-    UNIMPLEMENTED;
-    return 0;
+    return _inp(port);
 }
 
-unsigned short _inpw( 
+unsigned short MSVCRT__inpw( 
    unsigned short port)
 {
-    UNIMPLEMENTED;
-    return 0;
+    return _inpw(port);
 }
 
-unsigned long _inpd( 
+unsigned long MSVCRT__inpd( 
    unsigned short port)
 {
-    return 0;
+    return _inpd(port);
 }
 
 
-int _outp(
+int MSVCRT__outp(
    unsigned short port,
    int databyte)
 {
-    UNIMPLEMENTED;
-    return 0;
+    return _outp(port, databyte);
 }
 
-unsigned short _outpw(
+unsigned short MSVCRT__outpw(
    unsigned short port,
    unsigned short dataword)
 {
-    UNIMPLEMENTED;
-    return 0;
+    return _outpw(port, dataword);
 }
 
-unsigned long _outpd(
+unsigned long MSVCRT__outpd(
    unsigned short port,
    unsigned long dataword)
 {
-    UNIMPLEMENTED;
-    return 0;
+    return _outpd(port, dataword);
 }