[DCIMAN32]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 27 Sep 2014 11:46:43 +0000 (11:46 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 27 Sep 2014 11:46:43 +0000 (11:46 +0000)
* Sync with Wine 1.7.27.
CORE-8540

svn path=/trunk/; revision=64336

reactos/dll/win32/dciman32/dciman_main.c
reactos/media/doc/README.WINE

index 1731d75..6446f28 100644 (file)
 
 WINE_DEFAULT_DEBUG_CHANNEL(dciman);
 
-/***********************************************************************
- *           DllEntryPoint (DCIMAN32.@)
- *
- * DCIMAN32 initialisation routine.
- */
-BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
-{
-    if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst );
-    return TRUE;
-}
-
-
 /***********************************************************************
  *             DCIOpenProvider (DCIMAN32.@)
  */
index 47ea966..b2fc3cc 100644 (file)
@@ -70,7 +70,7 @@ reactos/dll/win32/cryptdll            # Synced to Wine-1.7.17
 reactos/dll/win32/cryptnet            # Synced to Wine-1.7.27
 reactos/dll/win32/cryptui             # Synced to Wine-1.7.27
 reactos/dll/win32/dbghelp             # Synced to Wine-1.7.27
-reactos/dll/win32/dciman32            # Synced to Wine-1.7.17
+reactos/dll/win32/dciman32            # Synced to Wine-1.7.27
 reactos/dll/win32/dwmapi              # Synced to Wine-1.7.17
 reactos/dll/win32/faultrep            # Synced to Wine-1.7.17
 reactos/dll/win32/fltlib              # Synced to Wine-1.7.27