Add resources for boolean strings in several languages.

dlls/oleaut32/.cvsignore

 Makefile
 ole2disp.spec.c
 oleaut32.dll.dbg.c
+oleaut32.res
 oleaut32.spec.c
 oleaut32.spec.def
 typelib.spec.c

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
 

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;
+}

dlls/oleaut32/oleaut32.rc

+/*
+ * 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.
+ */

dlls/oleaut32/oleaut32_Cz.rc

+/*
+ * 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"
+}

dlls/oleaut32/oleaut32_De.rc

+/*
+ * 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"
+}

dlls/oleaut32/oleaut32_Dk.rc

+/*
+ * 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"
+}

dlls/oleaut32/oleaut32_En.rc

+/*
+ * 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"
+}

dlls/oleaut32/oleaut32_Es.rc

+/*
+ * 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"
+}

dlls/oleaut32/oleaut32_Fr.rc

+/*
+ * 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"
+}

dlls/oleaut32/oleaut32_Hu.rc

+/*
+ * 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"
+}

dlls/oleaut32/oleaut32_It.rc

+/*
+ * 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"
+}

dlls/oleaut32/oleaut32_Nl.rc

+/*
+ * 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"
+}

dlls/oleaut32/oleaut32_No.rc

+/*
+ * 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"
+}

dlls/oleaut32/oleaut32_Sv.rc

+/*
+ * 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"
+}

dlls/oleaut32/oleaut32_Th.rc

+/*
+ * 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   "»Ô´"
+}

dlls/oleaut32/resource.h

+/*
+ * 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 */

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
 {