Changeset 464 for trunk/src/kernel32/winimgres.cpp

Timestamp:

Aug 10, 1999, 12:55:11 AM (26 years ago)

Author:

phaller

Message:

Fix: ODINCRT support

File:

• trunk/src/kernel32/winimgres.cpp (modified) (6 diffs)

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.4 1999-06-23 19:36:24 phaller Exp $ */
+/* $Id: winimgres.cpp,v 1.5 1999-08-09 22:55:11 phaller Exp $ */
 
 /*
@@ -16 +16 @@
 #include <stdlib.h>
 #include <string.h>
+#include <odincrt.h>
+
 #include "misc.h"
 #include "nameid.h"
@@ -159 +161 @@
         unicodestr += *unicodestr;
     }
+    ODIN_FS_BEGIN
     res = new Win32Resource(this, id, NTRT_STRING, (ULONG)*unicodestr, (char *)unicodestr);
+    ODIN_FS_END
     if(res == NULL) {
         dprintf(("new Win32Resource failed!\n"));
@@ -165 +169 @@
     }
   }
-  else  res = new Win32Resource(this, id, type, pData->Size, resdata);
+  else
+    ODIN_FS_BEGIN
+    res = new Win32Resource(this, id, type, pData->Size, resdata);
+    ODIN_FS_END
 
   return res;
@@ -298 +305 @@
 
     hres = O32_FindResource(hinstance, lpszName, szType);
-    if(hres) {
+    if(hres)
+    {
+      ODIN_FS_BEGIN
       res = new Win32Resource(this, hres, (ULONG)lpszName, (ULONG)szType);
+      ODIN_FS_END
     }
 
     if(hres == NULL && (int)lpszName >> 16 == 0 && (int)szType == NTRT_STRING) {
       hres = O32_FindResource(hinstance, (LPCSTR)(((int)lpszName - 1)*16), (LPCSTR)NTRT_RCDATA);
-      if(hres) {
+      if(hres)
+      {
+         ODIN_FS_BEGIN
          res = new Win32Resource(this, hres, (ULONG)lpszName, (ULONG)szType);
+         ODIN_FS_END
       }
       else    dprintf(("FindResourceA can't find string %d\n", (int)lpszName));
@@ -393 +406 @@
 
     hres = O32_FindResource(hinstance, (LPCSTR)lpszName, (LPCSTR)szType);
-    if(hres) {
+    if(hres)
+    {
+      ODIN_FS_BEGIN
       res = new Win32Resource(this, hres, (ULONG)lpszName, (ULONG)szType);
+      ODIN_FS_END
     }
 
     if(hres == NULL && (int)lpszName >> 16 == 0 && (int)szType == NTRT_STRING) {
       hres = O32_FindResource(hinstance, (LPCSTR)(((ULONG)lpszName - 1)*16), (LPCSTR)NTRT_RCDATA);
-      if(hres) {
-         res = new Win32Resource(this, hres, (ULONG)lpszName, (ULONG)szType);
+      if(hres)
+      {
+        ODIN_FS_BEGIN
+        res = new Win32Resource(this, hres, (ULONG)lpszName, (ULONG)szType);
+        ODIN_FS_END
       }
       else    dprintf(("FindResourceW can't find string %d\n", (int)lpszName));