Module: wine
Branch: master
Commit: ca77d6c1daaa33ae455f6d509b035edb2f6a65f1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca77d6c1daaa33ae455f6d509…
Author: André Hentschel <nerv(a)dawncrow.de>
Date: Mon Jun 24 22:01:45 2013 +0200
oleaut32/tests: Get rid of IS_ANCIENT in vartest.
---
dlls/oleaut32/tests/vartest.c | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index 0d38b9d..247e08e 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -61,8 +61,6 @@ static WCHAR sz12_true[32];
static int HAVE_OLEAUT32_RECORD = 0;
/* Have I8/UI8 data type? */
static int HAVE_OLEAUT32_I8 = 0;
-/* Is this an ancient version with support for only I2/I4/R4/R8/DATE? */
-static int IS_ANCIENT = 0;
/* When comparing floating point values we cannot expect an exact match
* because the rounding errors depend on the exact algorithm.
@@ -130,7 +128,6 @@ static void init(void)
skip("No support for I8 and UI8 data types\n");
HAVE_OLEAUT32_RECORD = HAVE_FUNC(SafeArraySetRecordInfo);
- IS_ANCIENT = (!HAVE_FUNC(VarI1FromI2));
#undef HAVE_FUNC
}
@@ -470,8 +467,7 @@ static void test_VariantClear(void)
V_VT(&v) = VT_UI4;
V_UI4(&v) = ~0u;
hres = VariantClear(&v);
- ok((hres == S_OK && V_VT(&v) == VT_EMPTY) ||
- (IS_ANCIENT && hres == DISP_E_BADVARTYPE && V_VT(&v) == VT_UI4),
+ ok((hres == S_OK && V_VT(&v) == VT_EMPTY),
"VariantClear: Type set to %d, res %08x\n", V_VT(&v), hres);
ok(V_UI4(&v) == ~0u, "VariantClear: Overwrote value\n");
@@ -479,7 +475,7 @@ static void test_VariantClear(void)
* Also demonstrates that null pointers in 'v' are not dereferenced.
* Individual variant tests should test VariantClear() with non-NULL values.
*/
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++)
+ for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
{
VARTYPE vt;
@@ -589,7 +585,7 @@ static void test_VariantCopy(void)
*/
/* vSrc == vDst */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++)
+ for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
{
for (vt = 0; vt <= VT_BSTR_BLOB; vt++)
{
@@ -617,7 +613,7 @@ static void test_VariantCopy(void)
memset(&vSrc, 0, sizeof(vSrc));
V_VT(&vSrc) = VT_UI1;
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++)
+ for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
{
for (vt = 0; vt <= VT_BSTR_BLOB; vt++)
{
@@ -643,7 +639,7 @@ static void test_VariantCopy(void)
}
/* Test that VariantClear() checks vSrc for validity before copying */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++)
+ for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
{
for (vt = 0; vt <= VT_BSTR_BLOB; vt++)
{
@@ -720,7 +716,7 @@ static void test_VariantCopyInd(void)
memset(buffer, 0, sizeof(buffer));
/* vSrc == vDst */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++)
+ for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
{
if (ExtraFlags[i] & VT_ARRAY)
continue; /* Native crashes on NULL safearray */
@@ -771,7 +767,7 @@ static void test_VariantCopyInd(void)
V_VT(&vSrc) = VT_UI1|VT_BYREF;
V_BYREF(&vSrc) = &buffer;
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++)
+ for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
{
for (vt = 0; vt <= VT_BSTR_BLOB; vt++)
{
@@ -797,7 +793,7 @@ static void test_VariantCopyInd(void)
}
/* bad src */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++)
+ for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
{
if (ExtraFlags[i] & VT_ARRAY)
continue; /* Native crashes on NULL safearray */
Module: docs
Branch: master
Commit: 03ae8589a037e30655a094f18534c3fa0a81f314
URL: http://source.winehq.org/git/docs.git/?a=commit;h=03ae8589a037e30655a094f18…
Author: André Hentschel <nerv(a)dawncrow.de>
Date: Sat Jun 22 14:21:13 2013 +0200
winedev: Update architecture chapter.
---
en/winedev-architecture.sgml | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml
index bb8638b..d4bf8e1 100644
--- a/en/winedev-architecture.sgml
+++ b/en/winedev-architecture.sgml
@@ -218,8 +218,8 @@
exist, as Windows has support for different VDM (Virtual Dos
Machines) in order to have Win16 processes running in different
address spaces. Wine also uses the same architecture to run DOS
- programs (in this case, the DOS emulation is provided by a Wine only
- DLL called <filename>winedos</filename>.
+ programs (in this case, the DOS emulation is provided by
+ <filename>KRNL386.EXE</filename>).
</para>
</sect2>
</sect1>
@@ -368,7 +368,7 @@
+---------------------------------------+ +--------+
+---------------------------------------+ \
-| Wine executable (wine-?thread) | } unix executable
+| Wine executable | } unix executable
+---------------------------------------+ /
+---------------------------------------------------+ \
| Wine drivers | } Wine specific DLLs
@@ -418,7 +418,7 @@
provide a driver (in Windows sense) to a physical hardware
device. This driver will be a proxy to the Unix driver
(this is the case, for example, for the graphical part
- with X11 or SDL drivers, audio with OSS or ALSA drivers...).
+ with X11 or Mac drivers, audio with OSS or ALSA drivers...).
</para>
<para>
All DLLs provided by Wine try to stick as much as possible
@@ -452,12 +452,7 @@
terminated).
</para>
<para>
- In earlier versions of Wine the master socket mentioned
- above was actually created in the configuration directory;
- either your home directory's <filename>/wine</filename>
- subdirectory or wherever the
- <envar>WINEPREFIX</envar> environment variable points>.
- Since that might not be possible the socket is actually
+ The master socket mentioned above is
created within the <filename>/tmp</filename> directory
with a name that reflects the configuration directory.
This means that there can actually be several separate
@@ -545,8 +540,7 @@
</para>
<para>
The DLL descriptor and entry point table is generated by
- the <command>winebuild</command> tool (previously just
- named <command>build</command>), taking DLL specification
+ the <command>winebuild</command> tool, taking DLL specification
files with the extension <filename>.spec</filename> as
input. Resources (after compilation by
<command>wrc</command>) or message tables (after
@@ -730,7 +724,7 @@
work much worse than the corresponding built-in one, if at
all. For example, the native Windows <filename>GDI</filename>
library must be paired with a Windows display driver, which
- of course is not present under Intel Unix and Wine.
+ of course is not present under Unix and Wine.
</para>
<para>
Finally, occasionally built-in Wine DLLs implement more