Changeset 752 for trunk/src/kernel32/winres.cpp

Timestamp:

Aug 31, 1999, 4:36:46 PM (26 years ago)

Author:

sandervl

Message:

Added class for menu resources + fixed makefile

File:

• trunk/src/kernel32/winres.cpp (modified) (8 diffs)

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.12 1999-08-21 19:11:56 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.13 1999-08-31 14:36:46 sandervl Exp $ */
 
 /*
@@ -31 +31 @@
 #include <winexe.h>
 #include "cvtresource.h"
+#include <vmutex.h>
+
+VMutex resmutex;
 
 //******************************************************************************
@@ -86 +89 @@
 //******************************************************************************
 //******************************************************************************
+Win32Resource::Win32Resource() :
+        os2resdata(NULL), winresdata(NULL), resType(RSRC_CUSTOMNODATA)
+{
+  resmutex.enter();
+  next           = module->winres;
+  module->winres = this;
+  resmutex.leave();
+
+  module     = NULL;
+  id         = -1;
+  type       = -1;
+  hres       = 0;
+  orgos2type = -1;
+  OS2ResHandle = 0;
+}
+//******************************************************************************
+//******************************************************************************
 Win32Resource::Win32Resource(Win32Image *module, HRSRC hRes, ULONG id, ULONG type) :
         os2resdata(NULL), winresdata(NULL), resType(RSRC_PE2LX)
@@ -91 +111 @@
  APIRET rc;
 
+  resmutex.enter();
   next           = module->winres;
   module->winres = this;
+  resmutex.leave();
 
   this->module   = module;
@@ -145 +167 @@
         os2resdata(NULL), winresdata(NULL), resType(RSRC_PELOADER)
 {
+  resmutex.enter();
   next           = module->winres;
   module->winres = this;
+  resmutex.leave();
 
   this->module   = module;
@@ -178 +202 @@
   if(winresdata)    free(winresdata);
 
+  resmutex.enter();
   if(res == this) {
     module->winres = res->next;
@@ -188 +213 @@
         res->next = next;
   }
+  resmutex.leave();
 }
 //******************************************************************************
@@ -285 +311 @@
    dprintf(("Win32Resource::lockOS2Resource %d\n", id));
    if(os2resdata == NULL) {
-        if(resType == RSRC_PELOADER) {
+        if(resType == RSRC_PELOADER || resType == RSRC_CUSTOMINDIRECT) {
                 os2resdata = convertResource(winresdata);
         }