[KERNEL32]

- Move Vista+ APIs to their reservation.

svn path=/trunk/; revision=59558

diff --git a/reactos/dll/win32/kernel32/CMakeLists.txt b/reactos/dll/win32/kernel32/CMakeLists.txt
index 5b1e960..caf39ab 100644 (file)
--- a/reactos/dll/win32/kernel32/CMakeLists.txt
+++ b/reactos/dll/win32/kernel32/CMakeLists.txt
@@ -75,7 +75,6 @@ list(APPEND SOURCE
     winnls/string/lang.c
     winnls/string/lcformat.c
     winnls/string/lstring.c
-    winnls/string/mui.c
     winnls/string/nls.c
     winnls/string/sortkey.c
     kernel32.rc

diff --git a/reactos/dll/win32/kernel32/client/vista.c b/reactos/dll/win32/kernel32/client/vista.c
index 439c5d1..a5a1435 100644 (file)
--- a/reactos/dll/win32/kernel32/client/vista.c
+++ b/reactos/dll/win32/kernel32/client/vista.c
@@ -734,3 +734,176 @@ GetTickCount64(VOID)
      return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) +
             (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8);
 }
+
+/*
+  Vista+ MUI support functions
+
+  References:
+   Evolution of MUI Support across Windows Versions: http://msdn.microsoft.com/en-US/library/ee264317.aspx 
+   Comparing Windows XP Professional Multilingual Options: http://technet.microsoft.com/en-us/library/bb457045.aspx
+
+  More info:
+   http://msdn.microsoft.com/en-us/goglobal/bb978454.aspx 
+   http://msdn.microsoft.com/en-us/library/dd319074.aspx 
+*/
+
+/* FUNCTIONS *****************************************************************/
+
+BOOL
+WINAPI
+GetFileMUIInfo(
+    DWORD dwFlags,
+    PCWSTR pcwszFilePath,
+    PFILEMUIINFO pFileMUIInfo,
+    DWORD *pcbFileMUIInfo)
+{
+    DPRINT1("%x %p %p %p\n", dwFlags, pcwszFilePath, pFileMUIInfo, pcbFileMUIInfo);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+GetFileMUIPath(
+    DWORD dwFlags,
+    PCWSTR pcwszFilePath,
+    PWSTR pwszLanguage,
+    PULONG pcchLanguage,
+    PWSTR pwszFileMUIPath,
+    PULONG pcchFileMUIPath,
+    PULONGLONG pululEnumerator)
+{
+    DPRINT1("%x %p %p %p %p %p\n", dwFlags, pcwszFilePath, pwszLanguage, pwszFileMUIPath, pcchFileMUIPath, pululEnumerator);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+GetProcessPreferredUILanguages(
+    DWORD dwFlags,
+    PULONG pulNumLanguages,
+    PZZWSTR pwszLanguagesBuffer,
+    PULONG pcchLanguagesBuffer)
+{
+    DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+/*
+* @unimplemented
+*/
+BOOL
+WINAPI
+GetSystemPreferredUILanguages(
+    DWORD dwFlags,
+    PULONG pulNumLanguages,
+    PZZWSTR pwszLanguagesBuffer,
+    PULONG pcchLanguagesBuffer)
+{
+    DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+GetThreadPreferredUILanguages(
+    DWORD dwFlags,
+    PULONG pulNumLanguages,
+    PZZWSTR pwszLanguagesBuffer,
+    PULONG pcchLanguagesBuffer)
+{
+    DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+LANGID
+WINAPI
+GetThreadUILanguage(VOID)
+{
+    UNIMPLEMENTED;
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return 0;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+GetUILanguageInfo(
+    DWORD dwFlags,
+    PCZZWSTR pwmszLanguage,
+    PZZWSTR pwszFallbackLanguages,
+    PDWORD pcchFallbackLanguages,
+    PDWORD pdwAttributes)
+{
+    DPRINT1("%x %p %p %p %p\n", dwFlags, pwmszLanguage, pwszFallbackLanguages, pcchFallbackLanguages, pdwAttributes);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+GetUserPreferredUILanguages(
+    DWORD dwFlags,
+    PULONG pulNumLanguages,
+    PZZWSTR pwszLanguagesBuffer,
+    PULONG pcchLanguagesBuffer)
+{
+    DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+SetProcessPreferredUILanguages(
+    DWORD dwFlags,
+    PCZZWSTR pwszLanguagesBuffer,
+    PULONG pulNumLanguages)
+{
+    DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+SetThreadPreferredUILanguages(
+    DWORD dwFlags,
+    PCZZWSTR pwszLanguagesBuffer,
+    PULONG pulNumLanguages
+    )
+{
+    DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+

diff --git a/reactos/dll/win32/kernel32/winnls/string/mui.c b/reactos/dll/win32/kernel32/winnls/string/mui.c
deleted file mode 100644 (file)
index 5c95b22..0000000
--- a/reactos/dll/win32/kernel32/winnls/string/mui.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS system libraries
- * FILE:            dll/win32/kernel32/winnls/mui.c
- * PURPOSE:         MUI support functions
- * PROGRAMMERS:     Edison Henrique Andreassy (ehasis@hotmail.com)
- */
-
-/* INCLUDES ******************************************************************/
-#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
-
-/*
-  References:
-   Evolution of MUI Support across Windows Versions: http://msdn.microsoft.com/en-US/library/ee264317.aspx 
-   Comparing Windows XP Professional Multilingual Options: http://technet.microsoft.com/en-us/library/bb457045.aspx
-
-  More info:
-   http://msdn.microsoft.com/en-us/goglobal/bb978454.aspx 
-   http://msdn.microsoft.com/en-us/library/dd319074.aspx 
-*/
-
-/* FUNCTIONS *****************************************************************/
-
-BOOL
-WINAPI
-GetFileMUIInfo(
-    DWORD dwFlags,
-    PCWSTR pcwszFilePath,
-    PFILEMUIINFO pFileMUIInfo,
-    DWORD *pcbFileMUIInfo)
-{
-    DPRINT1("%x %p %p %p\n", dwFlags, pcwszFilePath, pFileMUIInfo, pcbFileMUIInfo);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-WINAPI
-GetFileMUIPath(
-    DWORD dwFlags,
-    PCWSTR pcwszFilePath,
-    PWSTR pwszLanguage,
-    PULONG pcchLanguage,
-    PWSTR pwszFileMUIPath,
-    PULONG pcchFileMUIPath,
-    PULONGLONG pululEnumerator)
-{
-    DPRINT1("%x %p %p %p %p %p\n", dwFlags, pcwszFilePath, pwszLanguage, pwszFileMUIPath, pcchFileMUIPath, pululEnumerator);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-WINAPI
-GetProcessPreferredUILanguages(
-    DWORD dwFlags,
-    PULONG pulNumLanguages,
-    PZZWSTR pwszLanguagesBuffer,
-    PULONG pcchLanguagesBuffer)
-{
-    DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-/*
-* @unimplemented
-*/
-BOOL
-WINAPI
-GetSystemPreferredUILanguages(
-    DWORD dwFlags,
-    PULONG pulNumLanguages,
-    PZZWSTR pwszLanguagesBuffer,
-    PULONG pcchLanguagesBuffer)
-{
-    DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-WINAPI
-GetThreadPreferredUILanguages(
-    DWORD dwFlags,
-    PULONG pulNumLanguages,
-    PZZWSTR pwszLanguagesBuffer,
-    PULONG pcchLanguagesBuffer)
-{
-    DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-/*
- * @unimplemented
- */
-LANGID
-WINAPI
-GetThreadUILanguage(VOID)
-{
-    UNIMPLEMENTED;
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-WINAPI
-GetUILanguageInfo(
-    DWORD dwFlags,
-    PCZZWSTR pwmszLanguage,
-    PZZWSTR pwszFallbackLanguages,
-    PDWORD pcchFallbackLanguages,
-    PDWORD pdwAttributes)
-{
-    DPRINT1("%x %p %p %p %p\n", dwFlags, pwmszLanguage, pwszFallbackLanguages, pcchFallbackLanguages, pdwAttributes);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-
-/*
- * @unimplemented
- */
-BOOL
-WINAPI
-GetUserPreferredUILanguages(
-    DWORD dwFlags,
-    PULONG pulNumLanguages,
-    PZZWSTR pwszLanguagesBuffer,
-    PULONG pcchLanguagesBuffer)
-{
-    DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-WINAPI
-SetProcessPreferredUILanguages(
-    DWORD dwFlags,
-    PCZZWSTR pwszLanguagesBuffer,
-    PULONG pulNumLanguages)
-{
-    DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-
-/*
- * @unimplemented
- */
-BOOL
-WINAPI
-SetThreadPreferredUILanguages(
-    DWORD dwFlags,
-    PCZZWSTR pwszLanguagesBuffer,
-    PULONG pulNumLanguages
-    )
-{
-    DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}