Changeset 2213 for trunk/src

Timestamp:

Dec 27, 1999, 7:42:49 PM (26 years ago)

Author:

sandervl

Message:

VT's codepage changes

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (2 diffs)
• codepage.cpp (added)
• makefile (modified) (3 diffs)
• profile.h (modified) (2 diffs)
• unicode.cpp (modified) (9 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.60 1999-12-24 18:40:08 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.61 1999-12-27 18:42:25 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -1062 +1062 @@
     IsExeStarted__Fv     @2001
 
+   GetDisplayCodepage__Fv                  @3000
+   GetWindowsCodepage__Fv                  @3001

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.71 1999-12-18 21:45:55 sandervl Exp $
+# $Id: makefile,v 1.72 1999-12-27 18:42:25 sandervl Exp $
 
 #
@@ -44 +44 @@
 atom.obj disk.obj directory.obj cvtbitmap.obj hmmmap.obj winfakepeldr.obj \
 cvtaccel.obj cvticon.obj cvticongrp.obj oslibexcept.obj cpu.obj process.obj \
-cvtcursor.obj cvtcursorgrp.obj stubs.obj interlock.obj toolhelp.obj
+cvtcursor.obj cvtcursorgrp.obj stubs.obj interlock.obj toolhelp.obj codepage.obj
 
 
@@ -400 +400 @@
 cpuhlp.obj: cpuhlp.asm
 environ.obj: environ.cpp $(PDWIN32_INCLUDE)\misc.h
+codepage.obj: codepage.cpp oslibdos.h profile.h $(PDWIN32_INCLUDE)\codepage.h
 
 clean:

trunk/src/kernel32/profile.h

@@ -1 @@
-/* $Id: profile.h,v 1.5 1999-11-22 20:35:51 sandervl Exp $ */
+/* $Id: profile.h,v 1.6 1999-12-27 18:42:25 sandervl Exp $ */
 /*
  * Profile header for initterm
@@ -28 +28 @@
                                           LPCSTR value);
 
+int ODIN_EXTERN(PROFILE_GetOdinIniInt)(LPCSTR section_name, LPCSTR key_name,
+                                          int value);
+
 #endif

trunk/src/kernel32/unicode.cpp

@@ -1 @@
-/* $Id: unicode.cpp,v 1.19 1999-12-05 21:11:40 sandervl Exp $ */
+/* $Id: unicode.cpp,v 1.20 1999-12-27 18:42:25 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 #include <string.h>
 #include "misc.h"
+#include "codepage.h"
 #include <unicode.h>
 
-static UconvObject uconv_object = NULL;
+/*static UconvObject uconv_object = NULL;*/
+/*
 BOOL getUconvObject( void )
 {
@@ -40 +42 @@
   return ret;
 }
-
+*/
 /***********************************************************************
  *              MultiByteToWideChar                (KERNEL32.534)
@@ -200 +202 @@
   return(TRUE);
 }
+
 //******************************************************************************
 // unilen: length of astring buffer (including 0 terminator)
 // returns string length
 //******************************************************************************
-int WIN32API UnicodeToAsciiN(LPCWSTR ustring, char *astring, int unilen)
+int UnicodeToCodepageN(LPCWSTR ustring, char *astring, int unilen, UconvObject uconv_object)
 {
   int i;
@@ -227 +230 @@
 //  unilen = min(length, unilen);
 
-  if (getUconvObject())
+  if (uconv_object)
   {
     if (unilen == 1)
@@ -264 +267 @@
   }
 }
+
+int WIN32API UnicodeToAsciiN(LPCWSTR ustring, char *astring, int unilen)
+{
+    return UnicodeToCodepageN(ustring, astring, unilen, GetWindowsUconvObject());
+}
+
 //******************************************************************************
 // Converts unicode string to ascii string
@@ -327 +336 @@
 // asciilen: max length of unicode buffer (including end 0)
 //******************************************************************************
-void WIN32API AsciiToUnicodeN(const char *ascii, WCHAR *unicode, int asciilen)
+void CodepageToUnicodeN(const char *ascii, WCHAR *unicode, int asciilen, UconvObject uconv_object)
 {
   int rc;
@@ -352 +361 @@
 
 //  dprintf(("KERNEL32: AsciiToUnicodeN %s\n", ascii));
-  if (getUconvObject())
+  if (uconv_object)
   {
     if (asciilen == 1)
@@ -389 +398 @@
   }
 }
+
+void WIN32API AsciiToUnicodeN(const char *ascii, WCHAR *unicode, int asciilen)
+{
+    CodepageToUnicodeN(ascii, unicode, asciilen, GetWindowsUconvObject());
+}
+
+
 //******************************************************************************
 // Copies the full string from ascii to unicode