Hi,
As per Alexandres suggestion this patch adds localised boolean text
to
oleaut32 as resource strings. You'll need to rerun ./configure after
applying.
I'm escaping from Bangkok while the APEC meeting is on here, so I'll
send the
remaining oleaut32 upates when I'm back.
Cheers,
Jon
Changelog:
Jon Griffiths <jon_p_griffiths@yahoo.com>
+dlls/oleaut32/oleaut32_Cz.rc dlls/oleaut32/oleaut32_De.rc
dlls/oleaut32/oleaut32_Dk.rc dlls/oleaut32/oleaut32_En.rc
dlls/oleaut32/oleaut32_Es.rc dlls/oleaut32/oleaut32_Fr.rc
dlls/oleaut32/oleaut32_Hu.rc dlls/oleaut32/oleaut32_It.rc
dlls/oleaut32/oleaut32_Nl.rc dlls/oleaut32/oleaut32_No.rc
dlls/oleaut32/oleaut32_Sv.rc dlls/oleaut32/oleaut32_Th.rc
dlls/oleaut32/resource.h dlls/oleaut32/oleaut32.rc
dlls/oleaut32/Makefile.in
Add resources for boolean strings in several languages
+dlls/oleaut32/oleaut.c
Add a DllMain and keep a reference to the dlls handle
+dlls/oleaut32/variant.h
Make a conversion simpler (removes gcc >3.2.2 warning)
__________________________________
Do you Yahoo!?
The New Yahoo! Shopping - with improved product search
http://shopping.yahoo.comdiff -uP wine/dlls/oleaut32/oleaut32_Cz.rc wine-develop/dlls/oleaut32/oleaut32_Cz.rc
--- wine/dlls/oleaut32/oleaut32_Cz.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32_Cz.rc 2003-10-12 13:39:17.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+
+#pragma code_page(1252)
+
+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 -uP wine/dlls/oleaut32/oleaut32_De.rc wine-develop/dlls/oleaut32/oleaut32_De.rc
--- wine/dlls/oleaut32/oleaut32_De.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32_De.rc 2003-10-12 13:38:52.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+
+#pragma code_page(1252)
+
+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 -uP wine/dlls/oleaut32/oleaut32_Dk.rc wine-develop/dlls/oleaut32/oleaut32_Dk.rc
--- wine/dlls/oleaut32/oleaut32_Dk.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32_Dk.rc 2003-10-12 13:46:13.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+
+#pragma code_page(1252)
+
+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 -uP wine/dlls/oleaut32/oleaut32_En.rc wine-develop/dlls/oleaut32/oleaut32_En.rc
--- wine/dlls/oleaut32/oleaut32_En.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32_En.rc 2003-10-12 13:39:12.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+
+#pragma code_page(1252)
+
+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 -uP wine/dlls/oleaut32/oleaut32_Es.rc wine-develop/dlls/oleaut32/oleaut32_Es.rc
--- wine/dlls/oleaut32/oleaut32_Es.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32_Es.rc 2003-10-12 13:43:07.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+
+#pragma code_page(1252)
+
+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 -uP wine/dlls/oleaut32/oleaut32_Fr.rc wine-develop/dlls/oleaut32/oleaut32_Fr.rc
--- wine/dlls/oleaut32/oleaut32_Fr.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32_Fr.rc 2003-10-12 13:39:06.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+
+#pragma code_page(1252)
+
+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 -uP wine/dlls/oleaut32/oleaut32_Hu.rc wine-develop/dlls/oleaut32/oleaut32_Hu.rc
--- wine/dlls/oleaut32/oleaut32_Hu.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32_Hu.rc 2003-10-12 21:22:38.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+
+#pragma code_page(1250)
+
+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 -uP wine/dlls/oleaut32/oleaut32_It.rc wine-develop/dlls/oleaut32/oleaut32_It.rc
--- wine/dlls/oleaut32/oleaut32_It.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32_It.rc 2003-10-12 13:51:15.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+
+#pragma code_page(1252)
+
+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 -uP wine/dlls/oleaut32/oleaut32_Nl.rc wine-develop/dlls/oleaut32/oleaut32_Nl.rc
--- wine/dlls/oleaut32/oleaut32_Nl.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32_Nl.rc 2003-10-12 21:18:56.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+
+#pragma code_page(1252)
+
+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 -uP wine/dlls/oleaut32/oleaut32_No.rc wine-develop/dlls/oleaut32/oleaut32_No.rc
--- wine/dlls/oleaut32/oleaut32_No.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32_No.rc 2003-10-12 13:56:38.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+
+#pragma code_page(1252)
+
+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 -uP wine/dlls/oleaut32/oleaut32.rc wine-develop/dlls/oleaut32/oleaut32.rc
--- wine/dlls/oleaut32/oleaut32.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32.rc 2003-10-12 21:19:42.000000000 +0100
@@ -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 -uP wine/dlls/oleaut32/oleaut32_Sv.rc wine-develop/dlls/oleaut32/oleaut32_Sv.rc
--- wine/dlls/oleaut32/oleaut32_Sv.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32_Sv.rc 2003-10-12 13:39:00.000000000 +0100
@@ -0,0 +1,34 @@
+/*
+ * 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
+ */
+
+#pragma code_page(1252)
+
+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 -uP wine/dlls/oleaut32/oleaut32_Th.rc wine-develop/dlls/oleaut32/oleaut32_Th.rc
--- wine/dlls/oleaut32/oleaut32_Th.rc 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut32_Th.rc 2003-10-12 14:19:32.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ * 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
+ */
+
+#pragma code_page(874)
+
+LANGUAGE LANG_THAI, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_TRUE "¨ÃÔ§"
+ IDS_FALSE "äÁè¨ÃÔ§"
+ IDS_YES "ãªè"
+ IDS_NO "äÁèãªè"
+ IDS_ON "à»Ô´"
+ IDS_OFF "»Ô´"
+}
diff -uP wine/dlls/oleaut32/oleaut.c wine-develop/dlls/oleaut32/oleaut.c
--- wine/dlls/oleaut32/oleaut.c 2003-10-12 11:37:19.000000000 +0100
+++ wine-develop/dlls/oleaut32/oleaut.c 2003-10-13 03:24:52.000000000 +0100
@@ -45,6 +45,8 @@
static BOOL BSTR_bCache = TRUE; /* Cache allocations to minimise alloc calls? */
+HMODULE OLEAUT32_hModule = NULL;
+
/******************************************************************************
* BSTR {OLEAUT32}
*
@@ -714,3 +716,22 @@
{
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 -uP wine/dlls/oleaut32/resource.h wine-develop/dlls/oleaut32/resource.h
--- wine/dlls/oleaut32/resource.h 1970-01-01 01:00:00.000000000 +0100
+++ wine-develop/dlls/oleaut32/resource.h 2003-10-12 13:17:20.000000000 +0100
@@ -0,0 +1,31 @@
+/*
+ * 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 -uP wine/dlls/oleaut32/variant.h wine-develop/dlls/oleaut32/variant.h
--- wine/dlls/oleaut32/variant.h 2003-10-03 04:36:46.000000000 +0100
+++ wine-develop/dlls/oleaut32/variant.h 2003-10-13 03:13:35.000000000 +0100
@@ -137,7 +137,7 @@
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 @@
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
{
@@ -414,3 +396,4 @@
} VARIANT_NUMBER_CHARS;
void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS*,LCID,DWORD);
+
--- wine/dlls/oleaut32/Makefile.in 2003-10-12 11:37:19.000000000 +0100
+++ wine-develop/dlls/oleaut32/Makefile.in 2003-10-13 15:27:32.000000000 +0100
@@ -32,7 +32,9 @@
ole2disp.c \
typelib16.c
-RC_SRCS = version.rc
+RC_SRCS = \
+ oleaut32.rc \
+ version.rc
SUBDIRS = tests
