From 36e939f09f66a61d8bd585ab2b1a66ff9205cfce Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 20 Sep 2013 09:55:04 +0000 Subject: [PATCH] [INITPKI] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60237 --- reactos/dll/win32/initpki/CMakeLists.txt | 2 -- reactos/dll/win32/initpki/main.c | 4 ---- reactos/media/doc/README.WINE | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/reactos/dll/win32/initpki/CMakeLists.txt b/reactos/dll/win32/initpki/CMakeLists.txt index 6133df72d0c..8d103379b39 100644 --- a/reactos/dll/win32/initpki/CMakeLists.txt +++ b/reactos/dll/win32/initpki/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(initpki.dll initpki.spec) @@ -11,7 +10,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/initpki.def) add_library(initpki SHARED ${SOURCE}) - set_module_type(initpki win32dll) target_link_libraries(initpki wine) add_importlibs(initpki msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/initpki/main.c b/reactos/dll/win32/initpki/main.c index ee757614481..75cdce4eff5 100644 --- a/reactos/dll/win32/initpki/main.c +++ b/reactos/dll/win32/initpki/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 aebcae295d8..3d8a8eb6713 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -86,7 +86,7 @@ reactos/dll/win32/imagehlp # Synced to Wine-1.7.1 reactos/dll/win32/imm32 # Synced to Wine-1.5.19 reactos/dll/win32/inetcomm # Synced to Wine-1.7.1 reactos/dll/win32/inetmib1 # Synced to Wine-1.7.1 -reactos/dll/win32/initpki # Synced to Wine-1.5.19 +reactos/dll/win32/initpki # Synced to Wine-1.7.1 reactos/dll/win32/inseng # Synced to Wine-1.5.4 reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to Wine-1.5.19