Author: akhaldi
Date: Sat May 19 14:15:59 2012
New Revision: 56630
URL: http://svn.reactos.org/svn/reactos?rev=56630&view=rev
Log:
[SPOOLSS_WINETEST]
* Sync to Wine 1.5.4.
Modified:
trunk/rostests/winetests/spoolss/spoolss.c
Modified: trunk/rostests/winetests/spoolss/spoolss.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/spoolss/spoolss…
==============================================================================
--- trunk/rostests/winetests/spoolss/spoolss.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/spoolss/spoolss.c [iso-8859-1] Sat May 19 14:15:59 2012
@@ -60,6 +60,16 @@
ptr = "SplInitializeWinSpoolDrv";
pSplInitializeWinSpoolDrv = (void *) GetProcAddress(hspl, ptr);
if (!pSplInitializeWinSpoolDrv) return ptr;
+
+
+ /* Calling BuildOtherNamesFromMachineName or SplInitializeWinSpoolDrv on
+ * Win7 results in a breakpoint exception. If you continue after hitting
+ * the breakpoint, the functions fail with ERROR_NOT_SUPPORTED. So we
+ * just skip the tests on Win7, since they won't provide any useful info.
+ * To detect Win7, we check whether UnloadDriver exists (it doesn't on
+ * Win7, but does exist on earlier Windows versions) */
+ ptr = "UnloadDriver";
+ if (GetProcAddress(hspl, ptr) == NULL) return ptr;
ptr = "winspool.drv";
@@ -198,10 +208,10 @@
{
LPCSTR ptr;
- /* spoolss.dll does not exist on win9x */
+ /* The tests fail on Win7 (see comments in load_function() */
ptr = load_functions();
if (ptr) {
- skip("%s not found\n", ptr);
+ win_skip("%s not found\n", ptr);
return;
}
Author: akhaldi
Date: Sat May 19 13:04:19 2012
New Revision: 56626
URL: http://svn.reactos.org/svn/reactos?rev=56626&view=rev
Log:
[RSAENH]
* Fix msvc build.
Removed:
trunk/reactos/dll/win32/rsaenh/version.rc
Modified:
trunk/reactos/dll/win32/rsaenh/CMakeLists.txt
Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Sat May 19 13:04:19 2012
@@ -17,12 +17,11 @@
rsaenh.c
sha2.c
rsrc.rc
- version.rc
${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def)
add_library(rsaenh SHARED ${SOURCE})
set_module_type(rsaenh win32dll)
-target_link_libraries(rsaenh wine)
+target_link_libraries(rsaenh uuid wine)
add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll)
add_pch(rsaenh tomcrypt.h)
add_cd_file(TARGET rsaenh DESTINATION reactos/system32 FOR all)
Removed: trunk/reactos/dll/win32/rsaenh/version.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/version.r…
==============================================================================
--- trunk/reactos/dll/win32/rsaenh/version.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rsaenh/version.rc (removed)
@@ -1,26 +1,0 @@
-/*
- * Copyright (c) 2007 Alexandre Julliard
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define WINE_FILEDESCRIPTION_STR "Wine rsaenh"
-#define WINE_FILENAME_STR "rsaenh.dll"
-#define WINE_FILEVERSION 5,1,2600,2180
-#define WINE_FILEVERSION_STR "5.1.2600.2180"
-#define WINE_PRODUCTVERSION 5,1,2600,2180
-#define WINE_PRODUCTVERSION_STR "5.1.2600.2180"
-
-#include "wine/wine_common_ver.rc"