Changeset 5564 for trunk/src

Timestamp:

Apr 22, 2001, 11:00:19 AM (24 years ago)

Author:

sandervl

Message:

removed wrong segment definition

Location:

trunk/src/kernel32

Files:

• codepage.cpp (modified) (1 diff)
• exceptutil.asm (modified) (2 diffs)
• heapshared.cpp (modified) (4 diffs)

trunk/src/kernel32/codepage.cpp

@@ -114 +114 @@
 
     return ansi_cptable->info.codepage;
-}
-
-static UconvObject GetObjectByCP(ULONG codepage)
-{
-    UconvObject rc = 0;
-    UniChar   codepage_str[12];
-
-    BOOL ret = UniMapCpToUcsCp(codepage, codepage_str, sizeof(codepage_str));
-    if ( ret == ULS_SUCCESS )
-    {
-        ret = UniCreateUconvObject( codepage_str, &rc );
-        if ( ret != ULS_SUCCESS )
-                rc = 0;
-    }
-    dprintf(("UniCreateUconvObject for CP %d (%08x)\n", codepage, rc ));
-    return rc;
-}
-
-static UconvObject DisplayUconv = NULL;
-static UconvObject WindowsUconv = NULL;
-
-UconvObject GetDisplayUconvObject()
-{
-    if (!DisplayUconv)
-        DisplayUconv = GetObjectByCP(GetDisplayCodepage());
-
-    return DisplayUconv;
-}
-
-UconvObject GetWindowsUconvObject()
-{
-    if (!WindowsUconv)
-        WindowsUconv = GetObjectByCP(GetWindowsCodepage());
-
-    return WindowsUconv;
 }
 

trunk/src/kernel32/exceptutil.asm

@@ -1 @@
-; $Id: exceptutil.asm,v 1.15 2001-04-21 09:10:14 sandervl Exp $
+; $Id: exceptutil.asm,v 1.16 2001-04-22 09:00:19 sandervl Exp $
 
 ;/*
@@ -17 +17 @@
 BSS32   segment dword use32 public 'BSS'
 BSS32   ends
-EH_CODE segment dword use32 public 'CODE'
-EH_CODE ends
-CTOR_DTOR1      segment dword use32 public 'DATA'
-CTOR_DTOR1      ends
-CTOR_DTOR2      segment dword use32 public 'DATA'
-CTOR_DTOR2      ends
-CTOR_DTOR3      segment dword use32 public 'DATA'
-CTOR_DTOR3      ends
-EH_DATA segment para use32 public 'DATA'
-EH_DATA ends
-_VFT    segment para use32 public 'DATA'
-_VFT    ends
 DGROUP  group BSS32, DATA32
         assume  cs:FLAT, ds:FLAT, ss:FLAT, es:FLAT

trunk/src/kernel32/heapshared.cpp

@@ -1 @@
-/* $Id: heapshared.cpp,v 1.7 2001-02-09 18:31:05 sandervl Exp $ */
+/* $Id: heapshared.cpp,v 1.8 2001-04-22 09:00:19 sandervl Exp $ */
 /*
  * Shared heap functions for OS/2
@@ -42 +42 @@
 
   if(pSharedMem == NULL) {
-        dprintf(("KERNEL32: InitializeSharedHeap %x", &sharedHeap));
         rc = DosAllocSharedMem(&pSharedMem, NULL, MAX_HEAPSIZE, PAG_READ|PAG_WRITE|OBJ_GETTABLE);
         if(rc != 0) {
@@ -63 +62 @@
                 return FALSE;
         }
+        dprintf(("KERNEL32: First InitializeSharedHeap %x %x", pSharedMem, sharedHeap));
         for(int i=0;i<INCR_HEAPSIZE/PAGE_SIZE;i++) {
                 pageBitmap[i] = 1; //mark as committed
@@ -72 +72 @@
                 return FALSE;
         }
+        dprintf(("KERNEL32: InitializeSharedHeap %x %x refcount %d", pSharedMem, sharedHeap, refCount));
         if(_uopen(sharedHeap) != 0) {
                 dprintf(("InitializeSharedHeap: unable to open shared heap!"));