[SPOOLSS]

* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60385

diff --git a/reactos/dll/win32/spoolss/CMakeLists.txt b/reactos/dll/win32/spoolss/CMakeLists.txt
index ead5246..67c269a 100644 (file)
--- a/reactos/dll/win32/spoolss/CMakeLists.txt
+++ b/reactos/dll/win32/spoolss/CMakeLists.txt
@@ -1,7 +1,6 @@
 
 

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 add_definitions(-D__WINESRC__)
 add_definitions(-D__WINESRC__)

-
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 spec2def(spoolss.dll spoolss.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
 spec2def(spoolss.dll spoolss.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE


@@ -11,9 +10,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def)
 
 add_library(spoolss SHARED ${SOURCE})
     ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def)
 
 add_library(spoolss SHARED ${SOURCE})

-allow_warnings(spoolss)

 set_module_type(spoolss win32dll)
 target_link_libraries(spoolss wine)
 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)
 add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/spoolss/spoolss_main.c b/reactos/dll/win32/spoolss/spoolss_main.c
index 6bb1d8d..25af2e2 100644 (file)
--- a/reactos/dll/win32/spoolss/spoolss_main.c
+++ b/reactos/dll/win32/spoolss/spoolss_main.c
@@ -57,6 +57,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
             break;
 
         case DLL_PROCESS_DETACH:
             break;
 
         case DLL_PROCESS_DETACH:

+            if (lpvReserved) break;

             backend_unload_all();
             break;
         }
             backend_unload_all();
             break;
         }

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 7d91364..7ba9791 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -181,7 +181,7 @@ reactos/dll/win32/shlwapi         # Synced to Wine-1.7.1
 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/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
 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