From 66ff876aa8d10e0dc2bf555d20c353f1871bd7b6 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Thu, 26 Aug 2004 16:03:09 +0000
Subject: [PATCH] - Implemented GetACP() and GetOEMCP().

svn path=/trunk/; revision=10691
---
 reactos/lib/kernel32/misc/lang.c | 34 +-------------------------------
 reactos/lib/kernel32/misc/nls.c  | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/reactos/lib/kernel32/misc/lang.c b/reactos/lib/kernel32/misc/lang.c
index 8ac5920ef9e..a115250b1d4 100644
--- a/reactos/lib/kernel32/misc/lang.c
+++ b/reactos/lib/kernel32/misc/lang.c
@@ -1,4 +1,4 @@
-/* $Id: lang.c,v 1.21 2004/08/24 17:21:11 navaraf Exp $
+/* $Id: lang.c,v 1.22 2004/08/26 16:03:09 hbirr Exp $
  *
  * COPYRIGHT: See COPYING in the top level directory
  * PROJECT  : ReactOS user mode libraries
@@ -316,23 +316,6 @@ EnumUILanguagesW(
     return 0;
 }
 
-
-#ifndef _OLE2NLS_IN_BUILD_
-
-/*
- * @unimplemented
- */
-UINT
-STDCALL
-GetACP (VOID)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 1252;
-}
-
-#endif
-
-
 /*
  * @unimplemented
  */
@@ -779,21 +762,6 @@ INT STDCALL GetLocaleInfoA( LCID lcid, LCTYPE lctype, LPSTR buffer, INT len )
 }
 
 
-
-
-
-/*
- * @unimplemented
- */
-UINT
-STDCALL
-GetOEMCP (VOID)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 437; /* FIXME: call csrss.exe */
-}
-
-
 #ifndef _OLE2NLS_IN_BUILD_
 
 /*
diff --git a/reactos/lib/kernel32/misc/nls.c b/reactos/lib/kernel32/misc/nls.c
index 5adca77d914..72c3a2ee6e5 100755
--- a/reactos/lib/kernel32/misc/nls.c
+++ b/reactos/lib/kernel32/misc/nls.c
@@ -794,4 +794,24 @@ WideCharToMultiByte(UINT CodePage, DWORD Flags,
    }
 }
 
+/*
+ * @implemented
+ */
+UINT
+STDCALL
+GetACP (VOID)
+{
+    return AnsiCodePage.CodePageTable.CodePage;
+}
+
+/*
+ * @implemented
+ */
+UINT
+STDCALL
+GetOEMCP (VOID)
+{
+    return OemCodePage.CodePageTable.CodePage;
+}
+
 /* EOF */