mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

#179508 

r=cls, pedemont, sr=blizzard for platform specific code
Add shared unicode stuff between OS/2 widget and gfx into gkgfx
This commit is contained in:
mkaply%us.ibm.com 2002-11-19 04:12:58 +00:00
Родитель 12fcad921c
Коммит d867bd2303
13 изменённых файлов: 212 добавлений и 218 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
gfx/src/Makefile.in
Просмотреть файл

@ -126,6 +126,20 @@ CPPSRCS += \
$(NULL)
endif
ifeq ($(OS_ARCH),OS2)
CPPSRCS += \
os2/nsOS2Uni.cpp \
$(NULL)
EXPORTS += \
os2/nsOS2Uni.h \
$(NULL)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
OS_LIBS += libconv.lib
else
OS_LIBS += -luconv
endif
endif
EXTRA_DSO_LDOPTS = \
$(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
$(MOZ_UNICHARUTIL_LIBS) \

2
gfx/src/os2/nsDeviceContextOS2.cpp
Просмотреть файл

@ -37,6 +37,8 @@
#include "nsGfxDefs.h"
#include "nsIPref.h"
#include "nsOS2Uni.h"
// Size of the color cube
#define COLOR_CUBE_SIZE 216

2
gfx/src/os2/nsDeviceContextSpecOS2.cpp
Просмотреть файл

@ -32,6 +32,8 @@
#include "nsIServiceManager.h"
#include "nsUnicharUtils.h"
#include "nsOS2Uni.h"
PRINTDLG nsDeviceContextSpecOS2::PrnDlg;
//----------------------------------------------------------------------------------

2
gfx/src/os2/nsFontMetricsOS2.cpp
Просмотреть файл

@ -44,6 +44,8 @@
#include "nsReadableUtils.h"
#include "nsUnicharUtils.h"
#include "nsOS2Uni.h"
#ifdef MOZ_MATHML
#include <math.h>
#endif

94
gfx/src/os2/nsGfxDefs.cpp
Просмотреть файл

@ -161,97 +161,3 @@ void PMERROR( const char *api)
DPRINTF ( "%s failed, error = 0x%X\n", api, usError);
}
int WideCharToMultiByte( int CodePage, const PRUnichar *pText, ULONG ulLength, char* szBuffer, ULONG ulSize )
{
UconvObject Converter = OS2Uni::GetUconvObject(CodePage);
UniChar *ucsString = (UniChar*) pText;
size_t ucsLen = ulLength;
size_t cplen = ulSize;
size_t cSubs = 0;
char *tmp = szBuffer; // function alters the out pointer
int unirc = ::UniUconvFromUcs( Converter, &ucsString, &ucsLen,
(void**) &tmp, &cplen, &cSubs);
if( unirc != ULS_SUCCESS )
return 0;
if( unirc == UCONV_E2BIG)
{
// terminate output string (truncating)
*(szBuffer + ulSize - 1) = '\0';
}
return ulSize - cplen;
}
int MultiByteToWideChar( int CodePage, const char*pText, ULONG ulLength, PRUnichar *szBuffer, ULONG ulSize )
{
UconvObject Converter = OS2Uni::GetUconvObject(CodePage);
char *ucsString = (char*) pText;
size_t ucsLen = ulLength;
size_t cplen = ulSize;
size_t cSubs = 0;
PRUnichar *tmp = szBuffer; // function alters the out pointer
int unirc = ::UniUconvToUcs( Converter, (void**)&ucsString, &ucsLen,
NS_REINTERPRET_CAST(UniChar**, &tmp),
&cplen, &cSubs);
if( unirc != ULS_SUCCESS )
return 0;
if( unirc == UCONV_E2BIG)
{
// terminate output string (truncating)
*(szBuffer + ulSize - 1) = '\0';
}
return ulSize - cplen;
}
nsHashtable OS2Uni::gUconvObjects;
UconvObject
OS2Uni::GetUconvObject(int CodePage)
{
nsPRUint32Key key(CodePage);
UconvObject uco = OS2Uni::gUconvObjects.Get(&key);
if (!uco) {
UniChar codepage[20];
int unirc = ::UniMapCpToUcsCp(CodePage, codepage, 20);
if (unirc == ULS_SUCCESS) {
unirc = ::UniCreateUconvObject(codepage, &uco);
if (unirc == ULS_SUCCESS) {
uconv_attribute_t attr;
::UniQueryUconvObject(uco, &attr, sizeof(uconv_attribute_t),
NULL, NULL, NULL);
attr.options = UCONV_OPTION_SUBSTITUTE_BOTH;
attr.subchar_len=1;
attr.subchar[0]='?';
::UniSetUconvObject(uco, &attr);
OS2Uni::gUconvObjects.Put(&key, uco);
}
}
}
return uco;
}
PR_STATIC_CALLBACK(PRIntn)
UconvObjectEnum(nsHashKey* hashKey, void *aData, void* closure)
{
UniFreeUconvObject((UconvObject)aData);
return kHashEnumerateRemove;
}
OS2Uni::FreeUconvObjects()
{
if (gUconvObjects.Count()) {
gUconvObjects.Enumerate(UconvObjectEnum, nsnull);
}
}

11
gfx/src/os2/nsGfxDefs.h
Просмотреть файл

@ -90,15 +90,4 @@ BOOL IsDBCS();
extern PRLogModuleInfo *gGFXOS2LogModule;
#endif
class OS2Uni {
public:
static UconvObject GetUconvObject(int CodePage);
static FreeUconvObjects();
private:
static nsHashtable gUconvObjects;
};
int WideCharToMultiByte( int CodePage, const PRUnichar *pText, ULONG ulLength, char* szBuffer, ULONG ulSize );
int MultiByteToWideChar( int CodePage, const char*pText, ULONG ulLength, PRUnichar *szBuffer, ULONG ulSize );
#endif

2
gfx/src/os2/nsGfxFactoryOS2.cpp
Просмотреть файл

@ -57,6 +57,8 @@
#include "nsPrintSession.h"
#include "gfxImageFrame.h"
#include "nsOS2Uni.h"
// objects that just require generic constructors
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontMetricsOS2)

132
gfx/src/os2/nsOS2Uni.cpp Normal file
Просмотреть файл

@ -0,0 +1,132 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is an API for accessing OS/2 Unicode support.
*
* The Initial Developer of the Original Code is
* IBM Corporation.
* Portions created by the Initial Developer are Copyright (C) 2002
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsOS2Uni.h"
int WideCharToMultiByte( int CodePage, const PRUnichar *pText, ULONG ulLength, char* szBuffer, ULONG ulSize )
{
UconvObject Converter = OS2Uni::GetUconvObject(CodePage);
UniChar *ucsString = (UniChar*) pText;
size_t ucsLen = ulLength;
size_t cplen = ulSize;
size_t cSubs = 0;
char *tmp = szBuffer; // function alters the out pointer
int unirc = ::UniUconvFromUcs( Converter, &ucsString, &ucsLen,
(void**) &tmp, &cplen, &cSubs);
if( unirc != ULS_SUCCESS )
return 0;
if( unirc == UCONV_E2BIG)
{
// terminate output string (truncating)
*(szBuffer + ulSize - 1) = '\0';
}
return ulSize - cplen;
}
int MultiByteToWideChar( int CodePage, const char*pText, ULONG ulLength, PRUnichar *szBuffer, ULONG ulSize )
{
UconvObject Converter = OS2Uni::GetUconvObject(CodePage);
char *ucsString = (char*) pText;
size_t ucsLen = ulLength;
size_t cplen = ulSize;
size_t cSubs = 0;
PRUnichar *tmp = szBuffer; // function alters the out pointer
int unirc = ::UniUconvToUcs( Converter, (void**)&ucsString, &ucsLen,
NS_REINTERPRET_CAST(UniChar**, &tmp),
&cplen, &cSubs);
if( unirc != ULS_SUCCESS )
return 0;
if( unirc == UCONV_E2BIG)
{
// terminate output string (truncating)
*(szBuffer + ulSize - 1) = '\0';
}
return ulSize - cplen;
}
nsHashtable OS2Uni::gUconvObjects;
UconvObject
OS2Uni::GetUconvObject(int CodePage)
{
nsPRUint32Key key(CodePage);
UconvObject uco = OS2Uni::gUconvObjects.Get(&key);
if (!uco) {
UniChar codepage[20];
int unirc = ::UniMapCpToUcsCp(CodePage, codepage, 20);
if (unirc == ULS_SUCCESS) {
unirc = ::UniCreateUconvObject(codepage, &uco);
if (unirc == ULS_SUCCESS) {
uconv_attribute_t attr;
::UniQueryUconvObject(uco, &attr, sizeof(uconv_attribute_t),
NULL, NULL, NULL);
attr.options = UCONV_OPTION_SUBSTITUTE_BOTH;
attr.subchar_len=1;
attr.subchar[0]='?';
::UniSetUconvObject(uco, &attr);
OS2Uni::gUconvObjects.Put(&key, uco);
}
}
}
return uco;
}
PR_STATIC_CALLBACK(PRIntn)
UconvObjectEnum(nsHashKey* hashKey, void *aData, void* closure)
{
UniFreeUconvObject((UconvObject)aData);
return kHashEnumerateRemove;
}
void OS2Uni::FreeUconvObjects()
{
if (gUconvObjects.Count()) {
gUconvObjects.Enumerate(UconvObjectEnum, nsnull);
}
}

56
gfx/src/os2/nsOS2Uni.h Normal file
Просмотреть файл

@ -0,0 +1,56 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is an API for accessing OS/2 Unicode support.
*
* The Initial Developer of the Original Code is
* IBM Corporation.
* Portions created by the Initial Developer are Copyright (C) 2002
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef _nsos2uni_h
#define _nsos2uni_h
#include <os2.h>
#include <uconv.h>
#include "nsHashTable.h"
class OS2Uni {
public:
static UconvObject GetUconvObject(int CodePage);
static void FreeUconvObjects();
private:
static nsHashtable gUconvObjects;
};
int WideCharToMultiByte( int CodePage, const PRUnichar *pText, ULONG ulLength, char* szBuffer, ULONG ulSize );
int MultiByteToWideChar( int CodePage, const char*pText, ULONG ulLength, PRUnichar *szBuffer, ULONG ulSize );
#endif

2
widget/src/os2/nsFilePicker.cpp
Просмотреть файл

@ -41,6 +41,8 @@
#include "nsModule.h"
#include "nsCRT.h"
#include "nsOS2Uni.h"
/* Item structure */
typedef struct _MyData
{

94
widget/src/os2/nsModule.cpp
Просмотреть файл

@ -433,97 +433,3 @@ const char *nsWidgetModuleData::DBCSstrrchr( const char *string, int c )
nsWidgetModuleData *gWidgetModuleData = nsnull;
int WideCharToMultiByte( int CodePage, const PRUnichar *pText, ULONG ulLength, char* szBuffer, ULONG ulSize )
{
UconvObject Converter = OS2Uni::GetUconvObject(CodePage);
UniChar *ucsString = (UniChar*) pText;
size_t ucsLen = ulLength;
size_t cplen = ulSize;
size_t cSubs = 0;
char *tmp = szBuffer; // function alters the out pointer
int unirc = ::UniUconvFromUcs( Converter, &ucsString, &ucsLen,
(void**) &tmp, &cplen, &cSubs);
if( unirc != ULS_SUCCESS )
return 0;
if( unirc == UCONV_E2BIG)
{
// terminate output string (truncating)
*(szBuffer + ulSize - 1) = '\0';
}
return ulSize - cplen;
}
int MultiByteToWideChar( int CodePage, const char*pText, ULONG ulLength, PRUnichar *szBuffer, ULONG ulSize )
{
UconvObject Converter = OS2Uni::GetUconvObject(CodePage);
char *ucsString = (char*) pText;
size_t ucsLen = ulLength;
size_t cplen = ulSize;
size_t cSubs = 0;
PRUnichar *tmp = szBuffer; // function alters the out pointer
int unirc = ::UniUconvToUcs( Converter, (void**)&ucsString, &ucsLen,
NS_REINTERPRET_CAST(UniChar**, &tmp),
&cplen, &cSubs);
if( unirc != ULS_SUCCESS )
return 0;
if( unirc == UCONV_E2BIG)
{
// terminate output string (truncating)
*(szBuffer + ulSize - 1) = '\0';
}
return ulSize - cplen;
}
nsHashtable OS2Uni::gUconvObjects;
UconvObject
OS2Uni::GetUconvObject(int CodePage)
{
nsPRUint32Key key(CodePage);
UconvObject uco = OS2Uni::gUconvObjects.Get(&key);
if (!uco) {
UniChar codepage[20];
int unirc = ::UniMapCpToUcsCp(CodePage, codepage, 20);
if (unirc == ULS_SUCCESS) {
unirc = ::UniCreateUconvObject(codepage, &uco);
if (unirc == ULS_SUCCESS) {
uconv_attribute_t attr;
::UniQueryUconvObject(uco, &attr, sizeof(uconv_attribute_t),
NULL, NULL, NULL);
attr.options = UCONV_OPTION_SUBSTITUTE_BOTH;
attr.subchar_len=1;
attr.subchar[0]='?';
::UniSetUconvObject(uco, &attr);
OS2Uni::gUconvObjects.Put(&key, uco);
}
}
}
return uco;
}
PR_STATIC_CALLBACK(PRIntn)
UconvObjectEnum(nsHashKey* hashKey, void *aData, void* closure)
{
UniFreeUconvObject((UconvObject)aData);
return kHashEnumerateRemove;
}
OS2Uni::FreeUconvObjects()
{
if (gUconvObjects.Count()) {
gUconvObjects.Enumerate(UconvObjectEnum, nsnull);
}
}

18
widget/src/os2/nsWidgetDefs.h
Просмотреть файл

@ -194,22 +194,4 @@ typedef struct _WZDROPXFER
// can be used as an lvalue too.
#define lastchar(s) *((s) + strlen((s)) - 1)
struct nsUconvInfo
{
PRUint16 mCodePage;
UconvObject mConverter;
nsUconvInfo* pNext;
};
class OS2Uni {
public:
static UconvObject GetUconvObject(int CodePage);
static FreeUconvObjects();
private:
static nsHashtable gUconvObjects;
};
int WideCharToMultiByte( int CodePage, const PRUnichar *pText, ULONG ulLength, char* szBuffer, ULONG ulSize );
int MultiByteToWideChar( int CodePage, const char*pText, ULONG ulLength, PRUnichar *szBuffer, ULONG ulSize );
#endif

1
widget/src/os2/nsWidgetFactory.cpp
Просмотреть файл

@ -284,7 +284,6 @@ static const nsModuleComponentInfo components[] =
PR_STATIC_CALLBACK(void)
nsWidgetOS2ModuleDtor(nsIModule *self)
{
OS2Uni::FreeUconvObjects();
}
NS_IMPL_NSGETMODULE_WITH_DTOR(nsWidgetOS2Module,