From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 26 Sep 2013 16:53:57 +0000 (+0000)
Subject: [SLBCSP]
X-Git-Tag: ReactOS-0.3.16~1168
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=8687fec5795634dc45e9be5dd98a3bf4e8ee950c;ds=sidebyside

[SLBCSP]
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60382
---

diff --git a/reactos/dll/win32/slbcsp/CMakeLists.txt b/reactos/dll/win32/slbcsp/CMakeLists.txt
index 50fb9d944d9..2ffbe2dd698 100644
--- a/reactos/dll/win32/slbcsp/CMakeLists.txt
+++ b/reactos/dll/win32/slbcsp/CMakeLists.txt
@@ -1,7 +1,6 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
-
 spec2def(slbcsp.dll slbcsp.spec)
 
 list(APPEND SOURCE
@@ -10,11 +9,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def)
 
 add_library(slbcsp SHARED ${SOURCE})
-
 set_module_type(slbcsp win32dll)
-
 target_link_libraries(slbcsp wine)
-
 add_importlibs(slbcsp msvcrt kernel32 ntdll)
-
 add_cd_file(TARGET slbcsp DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/slbcsp/main.c b/reactos/dll/win32/slbcsp/main.c
index 82d2e9af2e8..cdabe6e15cd 100644
--- a/reactos/dll/win32/slbcsp/main.c
+++ b/reactos/dll/win32/slbcsp/main.c
@@ -39,10 +39,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(hinstDLL);
             break;
-        case DLL_PROCESS_DETACH:
-            break;
-        default:
-            break;
     }
     return TRUE;
 }
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 2d59d021daf..f7da4d1bf35 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -178,7 +178,7 @@ reactos/dll/win32/shdocvw         # Synced to Wine-1.7.1
 reactos/dll/win32/shell32         # Forked at Wine-20071011
 reactos/dll/win32/shfolder        # Synced to Wine-1.7.1
 reactos/dll/win32/shlwapi         # Synced to Wine-1.7.1
-reactos/dll/win32/slbcsp          # Synced to Wine-1.5.19
+reactos/dll/win32/slbcsp          # Synced to Wine-1.7.1
 reactos/dll/win32/snmpapi         # Synced to Wine-1.5.19
 reactos/dll/win32/softpub         # Synced to Wine-1.5.19
 reactos/dll/win32/spoolss         # Synced to Wine-1.5.19