From ddb035e8bb9ee395f9a064aa14f746215c7c0ec6 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 27 Sep 2014 11:46:43 +0000 Subject: [PATCH] [DCIMAN32] * Sync with Wine 1.7.27. CORE-8540 svn path=/trunk/; revision=64336 --- reactos/dll/win32/dciman32/dciman_main.c | 12 ------------ reactos/media/doc/README.WINE | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/reactos/dll/win32/dciman32/dciman_main.c b/reactos/dll/win32/dciman32/dciman_main.c index 1731d756f29..6446f28aa2f 100644 --- a/reactos/dll/win32/dciman32/dciman_main.c +++ b/reactos/dll/win32/dciman32/dciman_main.c @@ -32,18 +32,6 @@ 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.@) */ diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 47ea966c62e..b2fc3ccd3dd 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -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