A couple more fixes to prepare for the final patch

Modified: trunk/reactos/include/ndk/ldrfuncs.h
Modified: trunk/reactos/include/ndk/rtltypes.h
Modified: trunk/reactos/lib/rtl/unicode.c
Modified: trunk/reactos/w32api/include/ddk/winddk.h

--- trunk/reactos/include/ndk/ldrfuncs.h	2005-09-06 05:58:48 UTC (rev 17688)
+++ trunk/reactos/include/ndk/ldrfuncs.h	2005-09-06 06:19:30 UTC (rev 17689)
@@ -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 ************************************************************/
 

--- trunk/reactos/include/ndk/rtltypes.h	2005-09-06 05:58:48 UTC (rev 17688)
+++ trunk/reactos/include/ndk/rtltypes.h	2005-09-06 06:19:30 UTC (rev 17689)
@@ -240,8 +240,10 @@

 #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 **************************************************************/
 

--- trunk/reactos/lib/rtl/unicode.c	2005-09-06 05:58:48 UTC (rev 17688)
+++ trunk/reactos/lib/rtl/unicode.c	2005-09-06 06:19:30 UTC (rev 17689)
@@ -2282,9 +2282,9 @@

  * @implemented
  */
 ULONG STDCALL

-RtlxUnicodeStringToAnsiSize(IN PUNICODE_STRING UnicodeString)

+RtlxUnicodeStringToAnsiSize(IN PCUNICODE_STRING UnicodeString)

 {

-   return RtlUnicodeStringToAnsiSize(UnicodeString);

+   return RtlUnicodeStringToAnsiSize((PUNICODE_STRING)UnicodeString);

 }
 
 

--- trunk/reactos/w32api/include/ddk/winddk.h	2005-09-06 05:58:48 UTC (rev 17688)
+++ trunk/reactos/w32api/include/ddk/winddk.h	2005-09-06 06:19:30 UTC (rev 17689)
@@ -5207,12 +5207,17 @@

   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
 DDKAPI
@@ -5822,7 +5827,7 @@

 ULONG
 DDKAPI
 RtlxUnicodeStringToAnsiSize(

-  IN PUNICODE_STRING  UnicodeString);

+  IN PCUNICODE_STRING  UnicodeString);

 
 /*
  * VOID