A couple more fixes to prepare for the final patch

svn path=/trunk/; revision=17689

diff --git a/reactos/include/ndk/ldrfuncs.h b/reactos/include/ndk/ldrfuncs.h
index a756b81..cb4dacb 100644 (file)
--- a/reactos/include/ndk/ldrfuncs.h
+++ b/reactos/include/ndk/ldrfuncs.h
@@ -12,7 +12,9 @@
 /* DEPENDENCIES **************************************************************/
 #include "ldrtypes.h"
 /* FIXME: this needs be implemented in the w32api ddk */
-//#include "ntimage.h"
+#ifdef _MSC_VER
+#include "ntimage.h"
+#endif
 
 /* FUNCTION TYPES ************************************************************/
 

diff --git a/reactos/include/ndk/rtltypes.h b/reactos/include/ndk/rtltypes.h
index d40195b..b7e9ba0 100644 (file)
--- a/reactos/include/ndk/rtltypes.h
+++ b/reactos/include/ndk/rtltypes.h
@@ -240,8 +240,10 @@ RemoveTailList(
 #define RTL_ATOM_IS_PINNED      0x1
 
 /* EXPORTED DATA *************************************************************/
+#ifdef NTOS_MODE_USER
 extern BOOLEAN NTSYSAPI NLS_MB_CODE_PAGE_TAG;
 extern BOOLEAN NTSYSAPI NLS_MB_OEM_CODE_PAGE_TAG;
+#endif
 
 /* ENUMERATIONS **************************************************************/
 

diff --git a/reactos/lib/rtl/unicode.c b/reactos/lib/rtl/unicode.c
index 286c2d2..56c0a44 100644 (file)
--- a/reactos/lib/rtl/unicode.c
+++ b/reactos/lib/rtl/unicode.c
@@ -2282,9 +2282,9 @@ RtlxOemStringToUnicodeSize(IN POEM_STRING OemString)
  * @implemented
  */
 ULONG STDCALL
-RtlxUnicodeStringToAnsiSize(IN PUNICODE_STRING UnicodeString)
+RtlxUnicodeStringToAnsiSize(IN PCUNICODE_STRING UnicodeString)
 {
-   return RtlUnicodeStringToAnsiSize(UnicodeString);
+   return RtlUnicodeStringToAnsiSize((PUNICODE_STRING)UnicodeString);
 }
 
 

diff --git a/reactos/w32api/include/ddk/winddk.h b/reactos/w32api/include/ddk/winddk.h
index 95711aa..d063d41 100644 (file)
--- a/reactos/w32api/include/ddk/winddk.h
+++ b/reactos/w32api/include/ddk/winddk.h
@@ -5207,11 +5207,16 @@ RtlCompareUnicodeString(
   IN PCUNICODE_STRING  String2,
   IN BOOLEAN  CaseInSensitive);
 
-NTOSAPI
+static __inline
 LARGE_INTEGER
-DDKAPI
-RtlConvertLongToLargeInteger(
-  IN LONG  SignedInteger);
+NTAPI_INLINE
+RtlConvertLongToLargeInteger(LONG SignedInteger)
+{
+    LARGE_INTEGER Result;
+
+    Result.QuadPart = SignedInteger;
+    return Result;
+}
 
 NTOSAPI
 LUID
@@ -5822,7 +5827,7 @@ NTOSAPI
 ULONG
 DDKAPI
 RtlxUnicodeStringToAnsiSize(
-  IN PUNICODE_STRING  UnicodeString);
+  IN PCUNICODE_STRING  UnicodeString);
 
 /*
  * VOID