January 2018 - Wine-commits

Stefan Dösinger : d3dx9/tests: Use float bit patterns in test_D3DXFloat_Array.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 23eb1cee87559df4e1b3901d1576020e73667024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23eb1cee87559df4e1b3901d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 7 16:44:48 2017 +0200 d3dx9/tests: Use float bit patterns in test_D3DXFloat_Array. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4c4649cba42731021037c4cedbd8e416449bc156) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 90 +++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index dddd806..ad4511b 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2368,52 +2368,62 @@ static void test_D3DXVec_Array(void) static void test_D3DXFloat_Array(void) { - static const float z = 0.0f; - /* Compilers set different sign bits on 0.0 / 0.0, pick the right ones for NaN and -NaN */ - float tmpnan = 0.0f/z; - float nnan = copysignf(1, tmpnan) < 0.0f ? tmpnan : -tmpnan; - float nan = -nnan; unsigned int i; void *out = NULL; D3DXFLOAT16 half; FLOAT single; + + /* Input floats through bit patterns because compilers do not generate reliable INF and NaN values. */ + union convert + { + DWORD d; + FLOAT f; + }; + struct { - FLOAT single_in; + union convert single_in; /* half_ver2 occurs on WXPPROSP3 (32 bit math), WVISTAADM (32/64 bit math), W7PRO (32 bit math) */ WORD half_ver1, half_ver2; /* single_out_ver2 confirms that half -> single conversion is consistent across platforms */ - FLOAT single_out_ver1, single_out_ver2; - } testdata[] = { - { 80000.0f, 0x7c00, 0x7ce2, 65536.0f, 80000.0f }, - { 65503.0f, 0x7bff, 0x7bff, 65504.0f, 65504.0f }, - { 65504.0f, 0x7bff, 0x7bff, 65504.0f, 65504.0f }, - { 65520.0f, 0x7bff, 0x7c00, 65504.0f, 65536.0f }, - { 65521.0f, 0x7c00, 0x7c00, 65536.0f, 65536.0f }, - { 65534.0f, 0x7c00, 0x7c00, 65536.0f, 65536.0f }, - { 65535.0f, 0x7c00, 0x7c00, 65535.0f, 65536.0f }, - { 65536.0f, 0x7c00, 0x7c00, 65536.0f, 65536.0f }, - { -80000.0f, 0xfc00, 0xfce2, -65536.0f, -80000.0f }, - { -65503.0f, 0xfbff, 0xfbff, -65504.0f, -65504.0f }, - { -65504.0f, 0xfbff, 0xfbff, -65504.0f, -65504.0f }, - { -65520.0f, 0xfbff, 0xfc00, -65504.0f, -65536.0f }, - { -65521.0f, 0xfc00, 0xfc00, -65536.0f, -65536.0f }, - { -65534.0f, 0xfc00, 0xfc00, -65536.0f, -65536.0f }, - { -65535.0f, 0xfc00, 0xfc00, -65535.0f, -65536.0f }, - { -65536.0f, 0xfc00, 0xfc00, -65536.0f, -65536.0f }, - { 1.0f/z, 0x7c00, 0x7fff, 65536.0f, 131008.0f }, - { -1.0f/z, 0xffff, 0xffff, -131008.0f, -131008.0f }, - { nan, 0x7fff, 0xffff, 131008.0f, -131008.0f }, - { nnan, 0xffff, 0xffff, -131008.0f, -131008.0f }, - { 0.0f, 0x0, 0x0, 0.0f, 0.0f }, - { -0.0f, 0x8000, 0x8000, 0.0f, 0.0f }, - { 2.9809595e-08f, 0x0, 0x0, 0.0f, 0.0f }, - { -2.9809595e-08f, 0x8000, 0x8000, -0.0f, -0.0f }, - { 2.9809598e-08f, 0x1, 0x0, 5.96046e-08f, 5.96046e-08f }, - { -2.9809598e-08f, 0x8001, 0x8000, -5.96046e-08f, -5.96046e-08f }, - { 8.9406967e-08f, 0x2, 0x1, 1.19209e-07f, 5.96046e-008 } + union convert single_out_ver1, single_out_ver2; + } + testdata[] = + { + { { 0x479c4000 }, 0x7c00, 0x7ce2, { 0x47800000 }, { 0x479c4000 } }, /* 80000.0f */ + { { 0x477fdf00 }, 0x7bff, 0x7bff, { 0x477fe000 }, { 0x477fe000 } }, /* 65503.0f */ + { { 0x477fe000 }, 0x7bff, 0x7bff, { 0x477fe000 }, { 0x477fe000 } }, /* 65504.0f */ + { { 0x477ff000 }, 0x7bff, 0x7c00, { 0x477fe000 }, { 0x47800000 } }, /* 65520.0f */ + { { 0x477ff100 }, 0x7c00, 0x7c00, { 0x47800000 }, { 0x47800000 } }, /* 65521.0f */ + + { { 0x477ffe00 }, 0x7c00, 0x7c00, { 0x47800000 }, { 0x47800000 } }, /* 65534.0f */ + { { 0x477fff00 }, 0x7c00, 0x7c00, { 0x477fff00 }, { 0x47800000 } }, /* 65535.0f */ + { { 0x47800000 }, 0x7c00, 0x7c00, { 0x47800000 }, { 0x47800000 } }, /* 65536.0f */ + { { 0xc79c4000 }, 0xfc00, 0xfce2, { 0xc7800000 }, { 0xc79c4000 } }, /* -80000.0f */ + { { 0xc77fdf00 }, 0xfbff, 0xfbff, { 0xc77fe000 }, { 0xc77fe000 } }, /* -65503.0f */ + + { { 0xc77fe000 }, 0xfbff, 0xfbff, { 0xc77fe000 }, { 0xc77fe000 } }, /* -65504.0f */ + { { 0xc77ff000 }, 0xfbff, 0xfc00, { 0xc77fe000 }, { 0xc7800000 } }, /* -65520.0f */ + { { 0xc77ff100 }, 0xfc00, 0xfc00, { 0xc7800000 }, { 0xc7800000 } }, /* -65521.0f */ + { { 0xc77ffe00 }, 0xfc00, 0xfc00, { 0xc7800000 }, { 0xc7800000 } }, /* -65534.0f */ + { { 0xc77fff00 }, 0xfc00, 0xfc00, { 0xc77fff00 }, { 0xc7800000 } }, /* -65535.0f */ + + { { 0xc7800000 }, 0xfc00, 0xfc00, { 0xc7800000 }, { 0xc7800000 } }, /* -65536.0f */ + { { 0x7f800000 }, 0x7c00, 0x7fff, { 0x47800000 }, { 0x47ffe000 } }, /* INF */ + { { 0xff800000 }, 0xffff, 0xffff, { 0xc7ffe000 }, { 0xc7ffe000 } }, /* -INF */ + { { 0x7fc00000 }, 0x7fff, 0xffff, { 0x47ffe000 }, { 0xc7ffe000 } }, /* NaN */ + { { 0xffc00000 }, 0xffff, 0xffff, { 0xc7ffe000 }, { 0xc7ffe000 } }, /* -NaN */ + + { { 0x00000000 }, 0x0000, 0x0000, { 0x00000000 }, { 0x00000000 } }, /* 0.0f */ + { { 0x80000000 }, 0x8000, 0x8000, { 0x00000000 }, { 0x00000000 } }, /* -0.0f */ + { { 0x330007ff }, 0x0000, 0x0000, { 0x00000000 }, { 0x00000000 } }, /* 2.9809595e-08f */ + { { 0xb30007ff }, 0x8000, 0x8000, { 0x80000000 }, { 0x80000000 } }, /* -2.9809595e-08f */ + { { 0x33000800 }, 0x0001, 0x0000, { 0x337ffff3 }, { 0x337ffff3 } }, /* 2.9809598e-08f */ + + { { 0xb3000800 }, 0x8001, 0x8000, { 0xb37ffff3 } ,{ 0xb37ffff3 } }, /* -2.9809598e-08f */ + { { 0x33c00000 }, 0x0002, 0x0001, { 0x33ffffd7 }, { 0x337ffff3 } }, /* 8.9406967e-08f */ }; /* exception on NULL out or in parameter */ @@ -2425,7 +2435,7 @@ static void test_D3DXFloat_Array(void) for (i = 0; i < sizeof(testdata)/sizeof(testdata[0]); i++) { - out = D3DXFloat32To16Array(&half, &testdata[i].single_in, 1); + out = D3DXFloat32To16Array(&half, &testdata[i].single_in.f, 1); ok(out == &half, "Got %p, expected %p.\n", out, &half); ok(half.value == testdata[i].half_ver1 || half.value == testdata[i].half_ver2, "Got %x, expected %x or %x for index %d.\n", half.value, testdata[i].half_ver1, @@ -2433,13 +2443,13 @@ static void test_D3DXFloat_Array(void) out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&testdata[i].half_ver1, 1); ok(out == &single, "Got %p, expected %p.\n", out, &single); - ok(relative_error(single, testdata[i].single_out_ver1) < admitted_error, - "Got %g, expected %g for index %d.\n", single, testdata[i].single_out_ver1, i); + ok(relative_error(single, testdata[i].single_out_ver1.f) < admitted_error, + "Got %g, expected %g for index %d.\n", single, testdata[i].single_out_ver1.f, i); out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&testdata[i].half_ver2, 1); ok(out == &single, "Got %p, expected %p.\n", out, &single); - ok(relative_error(single, testdata[i].single_out_ver2) < admitted_error, - "Got %g, expected %g for index %d.\n", single, testdata[i].single_out_ver2, i); + ok(relative_error(single, testdata[i].single_out_ver2.f) < admitted_error, + "Got %g, expected %g for index %d.\n", single, testdata[i].single_out_ver2.f, i); } }

1 0

Fabian Maurer : wineboot: In ProcessRunKeys use correct parentheses in condition.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 15d541f667c17f7ad69cd0e797cddf8b8707f1f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15d541f667c17f7ad69cd0e7… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 24 20:05:52 2017 +0200 wineboot: In ProcessRunKeys use correct parentheses in condition. Spotted by David Binderman. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8fc3f3437c260db23ddff453f9a9d5f79564b24d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wineboot/wineboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index ee5b8d4..2a65b9e 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -682,7 +682,7 @@ static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, return TRUE; if ((res = RegCreateKeyExW( hkWin, szKeyName, 0, NULL, 0, bDelete ? KEY_ALL_ACCESS : KEY_READ, - NULL, &hkRun, &dispos ) != ERROR_SUCCESS)) + NULL, &hkRun, &dispos )) != ERROR_SUCCESS) { RegCloseKey( hkWin ); return TRUE;

1 0

Alex Henrie : user32: Implement IDI_SHIELD.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: ee6db1cb74489ea32f8dce795c7d795f6aa9fc4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee6db1cb74489ea32f8dce79… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 19 10:23:46 2017 -0600 user32: Implement IDI_SHIELD. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c14a16b08911d1695e42b75c60436ace9f42ea01) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/Makefile.in | 1 + dlls/user32/resources/oic_shield.ico | Bin 0 -> 34494 bytes dlls/user32/resources/oic_shield.svg | 271 +++++++++++++++++++++++++++++++++++ dlls/user32/user32.rc | 2 + 4 files changed, 274 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee6db1cb74489ea32f8d…

1 0

Vincent Povirk : loader/wine.inf: Put 32-bit .ds fakedlls in windows/ twain_32.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 7de9d931a1ee68fab453034a9bd7da15981ae8cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7de9d931a1ee68fab453034a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 11 12:44:48 2017 -0500 loader/wine.inf: Put 32-bit .ds fakedlls in windows/twain_32. Some programs search for TWAIN devices by listing this directory. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 72e5f1af3d4a3a8230081d74fff52f0dacb6be9d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3f723be..766a6e7 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2517,6 +2517,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,rundll.exe,rundll.exe16 10,,twain.dll,twain.dll16 10,,twain_32.dll +10,twain_32,sane.ds +10,twain_32,gphoto2.ds 10,,winhelp.exe,winhelp.exe16 10,,winhlp32.exe 10,command,start.exe

1 0

Vincent Povirk : wine.inf: Put 64-bit .ds fakedlls in windows/twain_64.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 82c3db595fa78492fc6ab86fe7e7a77930cacb2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c3db595fa78492fc6ab86f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 18 16:44:26 2017 -0500 wine.inf: Put 64-bit .ds fakedlls in windows/twain_64. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 02c35582f6b1f2cd990b705eee09b36517be7d98) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 766a6e7..923b3ab 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -79,7 +79,7 @@ AddReg=\ [DefaultInstall.ntamd64] RegisterDlls=RegisterDllsSection -WineFakeDlls=FakeDlls +WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni CopyFiles=(a)l_intl.nls @@ -2529,6 +2529,11 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dsound.vxd 11,,winhlp32.exe +; 64bit-only fake dlls +[FakeDllsWin64] +10,twain_64,sane.ds +10,twain_64,gphoto2.ds + ; Wow64-only fake dlls [FakeDllsWow64] ; create some directories first

1 0

Piotr Caban : wine.inf: Add Windows Messaging Subsystem MAPI registry key.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 62c723194a4d3ac231847ace31bdf2768427fdc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62c723194a4d3ac231847ace… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 31 19:42:53 2017 +0100 wine.inf: Add Windows Messaging Subsystem MAPI registry key. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bc865fa41a56dfb54b0ed59c02bf180fa764a4c6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 923b3ab..64fa25a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -679,6 +679,7 @@ HKLM,Software\Microsoft\SystemCertificates,,16 HKLM,Software\Microsoft\TermServLicensing,,16 HKLM,Software\Microsoft\Transaction Server,,16 HKLM,Software\Microsoft\WBEM,"Installation Directory",2,"%11%\wbem" +HKLM,Software\Microsoft\Windows Messaging Subsystem,"MAPI",2,"1" HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\hivelist,,16

1 0

Zebediah Figura : d3dcompiler: Fix a buffer size computation.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 483a9a47fa875445c3e2226f5d08414a6922ec0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=483a9a47fa875445c3e2226f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 7 11:38:58 2017 -0500 d3dcompiler: Fix a buffer size computation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 63d6dce04746237c1cb39c22914ed666c55178e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c5f66d6..c2c415f 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1151,7 +1151,7 @@ preproc_directive: PRE_LINE STRING hlsl_ctx.line_no = $1; if (strcmp($2, hlsl_ctx.source_file)) new_array = d3dcompiler_realloc(hlsl_ctx.source_files, - sizeof(*hlsl_ctx.source_files) * hlsl_ctx.source_files_count + 1); + sizeof(*hlsl_ctx.source_files) * (hlsl_ctx.source_files_count + 1)); if (new_array) {

1 0

Fabian Maurer : ole32: Don't redefine htole32/htole16.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: ef2d127bbc67e3caa94e2bbb2465ca11ffb2f4d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef2d127bbc67e3caa94e2bbb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Oct 7 18:14:53 2017 +0200 ole32: Don't redefine htole32/htole16. On some systems these macros are already defined in usr/include/endian.h Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0736e4e302aded8791ce1e9a6c0fc805bcd55aff) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/storage32.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 4fcfd9c..c628523 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -528,15 +528,23 @@ StgStreamImpl* StgStreamImpl_Construct( */ #ifdef WORDS_BIGENDIAN +#ifndef htole32 #define htole32(x) RtlUlongByteSwap(x) +#endif +#ifndef htole16 #define htole16(x) RtlUshortByteSwap(x) +#endif #define lendian32toh(x) RtlUlongByteSwap(x) #define lendian16toh(x) RtlUshortByteSwap(x) #else +#ifndef htole32 #define htole32(x) (x) +#endif +#ifndef htole16 #define htole16(x) (x) +#endif #define lendian32toh(x) (x) #define lendian16toh(x) (x)

1 0

Daniel Lehman : server: Fix copy & paste for number of subkeys.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: d92539362860c9053e0d7557c0d05cf5bee4ed15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d92539362860c9053e0d7557… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Apr 25 09:46:18 2017 -0700 server: Fix copy & paste for number of subkeys. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 47df3778aa85c20a05d12f8d2869e268c8e979f7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index 0731b22..734a111 100644 --- a/server/registry.c +++ b/server/registry.c @@ -568,7 +568,7 @@ static int grow_subkeys( struct key *key ) } else { - nb_subkeys = MIN_VALUES; + nb_subkeys = MIN_SUBKEYS; if (!(new_subkeys = mem_alloc( nb_subkeys * sizeof(*new_subkeys) ))) return 0; } key->subkeys = new_subkeys;

1 0

Alexandre Julliard : README: Remove references to removed Wiki pages.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 488c12ed12db4da486a0fa6ca3db5baf89c77e21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=488c12ed12db4da486a0fa6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 28 12:21:58 2017 +0200 README: Remove references to removed Wiki pages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d8fe80c5c5a911c8b2fb23f33b57e996e94768ed) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- README | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/README b/README index 5423e7b..70cb004 100644 --- a/README +++ b/README @@ -74,13 +74,9 @@ Basic requirements: Optional support libraries: Configure will display notices when optional libraries are not found on your system. See http://wiki.winehq.org/Recommended_Packages for - hints about the packages you should install. - - On 64-bit platforms, if compiling Wine as 32-bit (default), you have - to make sure to install the 32-bit versions of these libraries; see - http://wiki.winehq.org/WineOn64bit for details. If you want a true - 64-bit Wine (or a mixed 32-bit and 64-bit Wine setup), see - http://wiki.winehq.org/Wine64 for details. + hints about the packages you should install. On 64-bit platforms, + you have to make sure to install the 32-bit versions of these + libraries. 4. COMPILATION

1 0