Merging r37048, r37051, r37052, r37055 from the-real-msvc branch

[reactos.git] / reactos / lib / rtl / res.c

diff --git a/reactos/lib/rtl/res.c b/reactos/lib/rtl/res.c
index edd0c72..4714ae6 100644 (file)
--- a/reactos/lib/rtl/res.c
+++ b/reactos/lib/rtl/res.c
@@ -60,7 +60,7 @@ static int is_data_file_module( PVOID BaseAddress )
  */
 int push_language( USHORT *list, ULONG pos, WORD lang )
 {
-    int i;
+    ULONG i;
     for (i = 0; i < pos; i++) if (list[i] == lang) return pos;
     list[pos++] = lang;
     return pos;
@@ -144,7 +144,7 @@ IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( IMAGE_RESOURCE_DIRECTORY *dir,
     {
         pos = (min + max) / 2;
         str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const char *)root + entry[pos].NameOffset);
-        res = wcsncmp( name, str->NameString, str->Length );
+        res = _wcsnicmp( name, str->NameString, str->Length );
         if (!res && namelen == str->Length)
         {
             if (!entry[pos].DataIsDirectory == !want_dir)
@@ -215,7 +215,7 @@ LdrFindResource_U(PVOID BaseAddress,
 
     _SEH_TRY
     {
-       if (ResourceInfo) 
+       if (ResourceInfo)
         {
             DPRINT( "module %p type %ws name %ws lang %04lx level %ld\n",
                      BaseAddress, (LPCWSTR)ResourceInfo->Type,