Changeset 10185 for trunk/src/kernel32/message.cpp

Timestamp:

Jul 28, 2003, 1:35:32 PM (22 years ago)

Author:

sandervl

Message:

Updates

File:

• trunk/src/kernel32/message.cpp (modified) (7 diffs)

trunk/src/kernel32/message.cpp

@@ -1 @@
-/* $Id: message.cpp,v 1.13 2000-10-20 11:46:47 sandervl Exp $ */
+/* $Id: message.cpp,v 1.14 2003-07-28 11:35:31 sandervl Exp $ */
 
 /*
@@ -60 +60 @@
         DWORD   offset;
     } *se;
-    struct      _stringentry {
-        WORD    len;
-        WORD    unknown;
-        CHAR    str[1];
-    } *stre;
+    MESSAGE_RESOURCE_ENTRY *stre;
 
     /*FIXME: I am not sure about the '1' ... But I've only seen those entries*/
@@ -78 +74 @@
     for (i=nrofentries;i--;) {
         if ((id>=se->firstentry) && (id<=se->lastentry)) {
-            stre = (struct _stringentry*)(p+se->offset);
+            stre = (PMESSAGE_RESOURCE_ENTRY)(p+se->offset);
             id  -= se->firstentry;
             break;
@@ -87 +83 @@
         return 0;
     for (i=id;i--;) {
-        if (!(slen=stre->len))
+        if (!(slen=stre->Length))
                 return 0;
-        stre = (struct _stringentry*)(((char*)stre)+slen);
+        stre = (PMESSAGE_RESOURCE_ENTRY)(((char*)stre)+slen);
     }
-    slen=stre->len;
+    slen=stre->Length;
 
     i = min(buflen - 1, slen);
@@ -97 +93 @@
         return slen; /* different to LoadString */
     if (i>0) {
-        strncpy(buffer,stre->str,i);
-        buffer[i]=0;
+        if (stre->Flags & MESSAGE_RESOURCE_UNICODE)
+            WideCharToMultiByte( CP_ACP, 0, (LPWSTR)stre->Text, -1, buffer, i, NULL, NULL );
+        else
+            lstrcpynA(buffer, (LPSTR)stre->Text, i);
+        buffer[i]=0;
     } else {
         if (buflen>1) {
@@ -166 +165 @@
    if (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)
    {
-      from = (char*)HeapAlloc( GetProcessHeap(),0,200 );
-      sprintf(from,"Systemmessage, messageid = 0x%08lx\n",dwMessageId);
+      INT bufsize;
+      HMODULE hmodule;
+
+      hmodule = GetModuleHandleA("kernel32");
+      bufsize=LoadMessageA(hmodule,dwMessageId,dwLanguageId,NULL,100);
+      if (bufsize)
+      {
+        from = (char*)HeapAlloc( GetProcessHeap(), 0, bufsize + 1 );
+        LoadMessageA(hmodule,dwMessageId,dwLanguageId,from,bufsize+1);
+      }
    }
 
@@ -415 +422 @@
    if (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)
    {
-      /* gather information from system message tables ... */
-      from = (char*)HeapAlloc( GetProcessHeap(),0,200 );
-      sprintf(from,"Systemmessage, messageid = 0x%08lx\n",dwMessageId);
+      INT bufsize;
+      HMODULE hmodule;
+
+      hmodule = GetModuleHandleA("kernel32");
+      bufsize=LoadMessageA(hmodule,dwMessageId,dwLanguageId,NULL,100);
+      if (bufsize)
+      {
+        from = (char*)HeapAlloc( GetProcessHeap(), 0, bufsize + 1 );
+        LoadMessageA(hmodule,dwMessageId,dwLanguageId,from,bufsize+1);
+      }
    }