Author: akhaldi Date: Thu Sep 26 16:57:33 2013 New Revision: 60385
URL: http://svn.reactos.org/svn/reactos?rev=60385&view=rev Log: [SPOOLSS] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/reactos/dll/win32/spoolss/CMakeLists.txt trunk/reactos/dll/win32/spoolss/spoolss_main.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/CMakeList... ============================================================================== --- trunk/reactos/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:57:33 2013 @@ -1,7 +1,6 @@
+add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__WINESRC__) - spec2def(spoolss.dll spoolss.spec ADD_IMPORTLIB)
list(APPEND SOURCE @@ -11,9 +10,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def)
add_library(spoolss SHARED ${SOURCE}) -allow_warnings(spoolss) set_module_type(spoolss win32dll) target_link_libraries(spoolss wine) -add_importlibs(spoolss winspool msvcrt kernel32 ntdll) - +add_importlibs(spoolss msvcrt kernel32 ntdll) add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/spoolss/spoolss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss_m... ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/spoolss_main.c [iso-8859-1] Thu Sep 26 16:57:33 2013 @@ -57,6 +57,7 @@ break;
case DLL_PROCESS_DETACH: + if (lpvReserved) break; backend_unload_all(); break; }
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 26 16:57:33 2013 @@ -181,7 +181,7 @@ reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 reactos/dll/win32/softpub # Synced to Wine-1.5.19 -reactos/dll/win32/spoolss # Synced to Wine-1.5.19 +reactos/dll/win32/spoolss # Synced to Wine-1.7.1 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 reactos/dll/win32/sti # Synced to Wine-1.5.4