From cc83d9addca335343585f42992915d70dec3ce42 Mon Sep 17 00:00:00 2001 From: Jon Griffiths Date: Wed, 15 Oct 2003 20:50:24 +0000 Subject: [PATCH] Add resources for boolean strings in several languages. --- dlls/oleaut32/.cvsignore | 1 + dlls/oleaut32/Makefile.in | 4 +++- dlls/oleaut32/oleaut.c | 21 +++++++++++++++++++++ dlls/oleaut32/oleaut32.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32_Cz.rc | 31 +++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32_De.rc | 31 +++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32_Dk.rc | 31 +++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32_En.rc | 31 +++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32_Es.rc | 31 +++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32_Fr.rc | 31 +++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32_Hu.rc | 31 +++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32_It.rc | 31 +++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32_Nl.rc | 31 +++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32_No.rc | 31 +++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32_Sv.rc | 31 +++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32_Th.rc | 31 +++++++++++++++++++++++++++++++ dlls/oleaut32/resource.h | 30 ++++++++++++++++++++++++++++++ dlls/oleaut32/variant.h | 20 +------------------- 18 files changed, 471 insertions(+), 20 deletions(-) create mode 100644 dlls/oleaut32/oleaut32.rc create mode 100644 dlls/oleaut32/oleaut32_Cz.rc create mode 100644 dlls/oleaut32/oleaut32_De.rc create mode 100644 dlls/oleaut32/oleaut32_Dk.rc create mode 100644 dlls/oleaut32/oleaut32_En.rc create mode 100644 dlls/oleaut32/oleaut32_Es.rc create mode 100644 dlls/oleaut32/oleaut32_Fr.rc create mode 100644 dlls/oleaut32/oleaut32_Hu.rc create mode 100644 dlls/oleaut32/oleaut32_It.rc create mode 100644 dlls/oleaut32/oleaut32_Nl.rc create mode 100644 dlls/oleaut32/oleaut32_No.rc create mode 100644 dlls/oleaut32/oleaut32_Sv.rc create mode 100644 dlls/oleaut32/oleaut32_Th.rc create mode 100644 dlls/oleaut32/resource.h diff --git a/dlls/oleaut32/.cvsignore b/dlls/oleaut32/.cvsignore index 0dc98c507d7..8da703e3748 100644 --- a/dlls/oleaut32/.cvsignore +++ b/dlls/oleaut32/.cvsignore @@ -1,6 +1,7 @@ Makefile ole2disp.spec.c oleaut32.dll.dbg.c +oleaut32.res oleaut32.spec.c oleaut32.spec.def typelib.spec.c diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index ee740b51d1e..8009dddeed7 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -32,7 +32,9 @@ C_SRCS16 = \ ole2disp.c \ typelib16.c -RC_SRCS = version.rc +RC_SRCS = \ + oleaut32.rc \ + version.rc SUBDIRS = tests diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 69f2b763e4f..3792b89b50a 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -45,6 +45,8 @@ extern const GUID CLSID_PSDispatch; static BOOL BSTR_bCache = TRUE; /* Cache allocations to minimise alloc calls? */ +HMODULE OLEAUT32_hModule = NULL; + /****************************************************************************** * BSTR {OLEAUT32} * @@ -714,3 +716,22 @@ HRESULT WINAPI OLEAUT32_DllCanUnloadNow() { return S_FALSE; } + +/***************************************************************************** + * DllMain [OLEAUT32.@] + */ +BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p,%lu,%p)\n", hInstDll, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDll); + OLEAUT32_hModule = (HMODULE)hInstDll; + break; + case DLL_PROCESS_DETACH: + break; + }; + + return TRUE; +} diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc new file mode 100644 index 00000000000..38e8decbc59 --- /dev/null +++ b/dlls/oleaut32/oleaut32.rc @@ -0,0 +1,43 @@ +/* + * Top level resource file for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" +#include "resource.h" + +#include "oleaut32_De.rc" +#include "oleaut32_Dk.rc" +#include "oleaut32_En.rc" +#include "oleaut32_Es.rc" +#include "oleaut32_Cz.rc" +#include "oleaut32_Fr.rc" +#include "oleaut32_Hu.rc" +#include "oleaut32_It.rc" +#include "oleaut32_Nl.rc" +#include "oleaut32_No.rc" +#include "oleaut32_Sv.rc" +#include "oleaut32_Th.rc" + +/* + * FIXME: + * Polish, Finnish, Greek, Hebrew, Japanese, Korean, Portuguese, + * Russian, Turkish, Slovenian (at least) are localised in XP Home. + * I expect Chinese etc are localised in Asian Editions also. + */ diff --git a/dlls/oleaut32/oleaut32_Cz.rc b/dlls/oleaut32/oleaut32_Cz.rc new file mode 100644 index 00000000000..771aff80f31 --- /dev/null +++ b/dlls/oleaut32/oleaut32_Cz.rc @@ -0,0 +1,31 @@ +/* + * Czech resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Pravda" + IDS_FALSE "Nepravda" + IDS_YES "Ano" + IDS_NO "Ne" + IDS_ON "Zapnuto" + IDS_OFF "Vypnuto" +} diff --git a/dlls/oleaut32/oleaut32_De.rc b/dlls/oleaut32/oleaut32_De.rc new file mode 100644 index 00000000000..5b177846681 --- /dev/null +++ b/dlls/oleaut32/oleaut32_De.rc @@ -0,0 +1,31 @@ +/* + * German resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Wahr" + IDS_FALSE "Falsch" + IDS_YES "Ja" + IDS_NO "Nei" + IDS_ON "Ein" + IDS_OFF "Aus" +} diff --git a/dlls/oleaut32/oleaut32_Dk.rc b/dlls/oleaut32/oleaut32_Dk.rc new file mode 100644 index 00000000000..e250339bb4c --- /dev/null +++ b/dlls/oleaut32/oleaut32_Dk.rc @@ -0,0 +1,31 @@ +/* + * Danish resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Sand" + IDS_FALSE "Falsk" + IDS_YES "Ja" + IDS_NO "Nej" + IDS_ON "Til" + IDS_OFF "Fra" +} diff --git a/dlls/oleaut32/oleaut32_En.rc b/dlls/oleaut32/oleaut32_En.rc new file mode 100644 index 00000000000..7be7b0cf49a --- /dev/null +++ b/dlls/oleaut32/oleaut32_En.rc @@ -0,0 +1,31 @@ +/* + * English resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "True" + IDS_FALSE "False" + IDS_YES "Yes" + IDS_NO "No" + IDS_ON "On" + IDS_OFF "Off" +} diff --git a/dlls/oleaut32/oleaut32_Es.rc b/dlls/oleaut32/oleaut32_Es.rc new file mode 100644 index 00000000000..e62ff896561 --- /dev/null +++ b/dlls/oleaut32/oleaut32_Es.rc @@ -0,0 +1,31 @@ +/* + * Spanish resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Verdadero" + IDS_FALSE "Falso" + IDS_YES "Sí" + IDS_NO "No" + IDS_ON "Activado" + IDS_OFF "Desactivado" +} diff --git a/dlls/oleaut32/oleaut32_Fr.rc b/dlls/oleaut32/oleaut32_Fr.rc new file mode 100644 index 00000000000..944d9191df9 --- /dev/null +++ b/dlls/oleaut32/oleaut32_Fr.rc @@ -0,0 +1,31 @@ +/* + * French resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Vrai" + IDS_FALSE "Faux" + IDS_YES "Oui" + IDS_NO "Non" + IDS_ON "Actif" + IDS_OFF "Inactif" +} diff --git a/dlls/oleaut32/oleaut32_Hu.rc b/dlls/oleaut32/oleaut32_Hu.rc new file mode 100644 index 00000000000..58d6d59846f --- /dev/null +++ b/dlls/oleaut32/oleaut32_Hu.rc @@ -0,0 +1,31 @@ +/* + * Hungarian resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Igaz" + IDS_FALSE "Hamis" + IDS_YES "Igen" + IDS_NO "Nem" + IDS_ON "Be" + IDS_OFF "Ki" +} diff --git a/dlls/oleaut32/oleaut32_It.rc b/dlls/oleaut32/oleaut32_It.rc new file mode 100644 index 00000000000..01f0eeab914 --- /dev/null +++ b/dlls/oleaut32/oleaut32_It.rc @@ -0,0 +1,31 @@ +/* + * Italian resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Vero" + IDS_FALSE "Falso" + IDS_YES "Sý" + IDS_NO "No" + IDS_ON "On" + IDS_OFF "Off" +} diff --git a/dlls/oleaut32/oleaut32_Nl.rc b/dlls/oleaut32/oleaut32_Nl.rc new file mode 100644 index 00000000000..8c27a3134c3 --- /dev/null +++ b/dlls/oleaut32/oleaut32_Nl.rc @@ -0,0 +1,31 @@ +/* + * Dutch resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Waar" + IDS_FALSE "Onwaar" + IDS_YES "Ja" + IDS_NO "Nee" + IDS_ON "Aan" + IDS_OFF "Uit" +} diff --git a/dlls/oleaut32/oleaut32_No.rc b/dlls/oleaut32/oleaut32_No.rc new file mode 100644 index 00000000000..b617230baba --- /dev/null +++ b/dlls/oleaut32/oleaut32_No.rc @@ -0,0 +1,31 @@ +/* + * Norwegian resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Sann" + IDS_FALSE "Usann" + IDS_YES "Ja" + IDS_NO "Nei" + IDS_ON "PÕ" + IDS_OFF "Av" +} diff --git a/dlls/oleaut32/oleaut32_Sv.rc b/dlls/oleaut32/oleaut32_Sv.rc new file mode 100644 index 00000000000..f862ab610a3 --- /dev/null +++ b/dlls/oleaut32/oleaut32_Sv.rc @@ -0,0 +1,31 @@ +/* + * Swedish resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Sant" + IDS_FALSE "Falskt" + IDS_YES "Ja" + IDS_NO "Nej" + IDS_ON "PÕ" + IDS_OFF "Av" +} diff --git a/dlls/oleaut32/oleaut32_Th.rc b/dlls/oleaut32/oleaut32_Th.rc new file mode 100644 index 00000000000..53315ff0842 --- /dev/null +++ b/dlls/oleaut32/oleaut32_Th.rc @@ -0,0 +1,31 @@ +/* + * Thai resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "¨ÃÔ§" + IDS_FALSE "äÁè¨ÃÔ§" + IDS_YES "ãªè" + IDS_NO "äÁèãªè" + IDS_ON "à»Ô´" + IDS_OFF "»Ô´" +} diff --git a/dlls/oleaut32/resource.h b/dlls/oleaut32/resource.h new file mode 100644 index 00000000000..63f675de1ac --- /dev/null +++ b/dlls/oleaut32/resource.h @@ -0,0 +1,30 @@ +/* + * Resource defines for oleaut32 + * + * Copyright 2003 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef WINE_OLEAUT32_RESOURCE_H +#define WINE_OLEAUT32_RESOURCE_H + +#define IDS_TRUE 100 +#define IDS_FALSE 101 +#define IDS_YES 102 +#define IDS_NO 103 +#define IDS_ON 104 +#define IDS_OFF 105 + +#endif /* WINE_OLEAUT32_RESOURCE_H */ diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index b6af4853541..e69a23b9dcf 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -137,7 +137,7 @@ BOTHTST(BYTE, LONG64, VarUI1FromI8, UI1_MIN, UI1_MAX); POSTST(BYTE, ULONG64, VarUI1FromUI8, UI1_MAX); /* I2 */ -POSTST(SHORT, BYTE, VarI2FromUI1, I2_MAX); +SIMPLE(SHORT, BYTE, VarI2FromUI1); BOTHTST(SHORT, LONG, VarI2FromI4, I2_MIN, I2_MAX); #define _VarI2FromR4(flt,out) VarI2FromR8((double)flt,out) #define _VarI2FromR8 VarI2FromR8 @@ -382,24 +382,6 @@ RETTYP _VarCyFromI8(LONG64 i, CY* o) { else res = (typ)whole - (typ)1; \ } while(0); -/* Localised text for variant conversions */ -typedef struct tagVARIANT_TEXT -{ - LPCWSTR szText; - BYTE langId; - BYTE iOffsetFalse; - BYTE iOffsetYes; - BYTE iOffsetNo; - BYTE iOffsetOn; - BYTE iOffsetOff; -} VARIANT_TEXT; - -#define NUM_LOCALISED_LANGS 13 - -extern const VARIANT_TEXT VARIANT_LocalisedTextList[NUM_LOCALISED_LANGS]; - -const VARIANT_TEXT *VARIANT_GetLocalisedText(LANGID); - /* The localised characters that make up a valid number */ typedef struct tagVARIANT_NUMBER_CHARS { -- 2.11.4.GIT