Author: fireball
Date: Sat Feb 26 13:31:58 2011
New Revision: 50908
URL: http://svn.reactos.org/svn/reactos?rev=50908&view=rev
Log:
- Don't free an invalid handle. Suggested by Johannes. Test failure remains in the log, so it's easy to spot the function misbehaves.
- P.S. Not much of an issue if it's lost during the next tests sync, as it would be a clearly visible change.
See issue #5771 for more details.
Modified:
trunk/rostests/winetests/kernel32/volume.c
Modified: trunk/rostests/winetests/kernel32/volume.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/volume…
==============================================================================
--- trunk/rostests/winetests/kernel32/volume.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/volume.c [iso-8859-1] Sat Feb 26 13:31:58 2011
@@ -427,7 +427,7 @@
hFind = pFindFirstVolumeA( Volume_2, MAX_PATH );
ok(hFind != INVALID_HANDLE_VALUE, "FindFirstVolume failed, err=%u\n",
GetLastError());
-
+ if (hFind != INVALID_HANDLE_VALUE) {
do
{
/* validate correct length of unique volume name */
@@ -440,6 +440,7 @@
} while (pFindNextVolumeA( hFind, Volume_2, MAX_PATH ));
ok(found, "volume name %s not found by Find[First/Next]Volume\n", Volume_1);
pFindVolumeClose( hFind );
+ }
}
START_TEST(volume)
Author: tkreuzer
Date: Fri Feb 25 18:44:20 2011
New Revision: 50903
URL: http://svn.reactos.org/svn/reactos?rev=50903&view=rev
Log:
[WININET]
Revert part of r47411. The revision was a wine sync, but no wine code was reverted, only the use of zlib is disabled. Fixes downloading audiograbber with rapps.
See issue #5663 for more details.
Modified:
trunk/reactos/dll/win32/wininet/wininet.rbuild
trunk/reactos/include/reactos/wine/config.h
Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.…
==============================================================================
--- trunk/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] Fri Feb 25 18:44:20 2011
@@ -6,7 +6,6 @@
<importlibrary definition="wininet.spec" />
<include base="wininet">.</include>
<include base="ReactOS">include/reactos/wine</include>
- <include base="zlib">.</include>
<define name="__WINESRC__" />
<define name="_WINE" />
@@ -23,7 +22,6 @@
<library>secur32</library>
<library>crypt32</library>
<library>ws2_32</library>
- <library>zlib</library>
<library>pseh</library>
<file>cookie.c</file>
<file>dialogs.c</file>
Modified: trunk/reactos/include/reactos/wine/config.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi…
==============================================================================
--- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Fri Feb 25 18:44:20 2011
@@ -456,12 +456,6 @@
/* Define to 1 if you have the <openssl/ssl.h> header file. */
/* #undef HAVE_OPENSSL_SSL_H */
-
-/* Define to 1 if you have the `z' library (-lz). */
-#define HAVE_ZLIB 1
-
-/* Define to 1 if you have the <zlib.h> header file. */
-#define HAVE_ZLIB_H 1
/* Define to 1 if you have the `pclose' function. */
#define HAVE_PCLOSE 1