From 94cc0b513687063c61dd26b7a87303b663caa3c1 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 26 Sep 2013 16:33:17 +0000 Subject: [PATCH] [RICHED32] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60371 --- reactos/dll/win32/riched32/CMakeLists.txt | 5 +---- reactos/dll/win32/riched32/richedit.c | 14 +++----------- reactos/media/doc/README.WINE | 2 +- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/reactos/dll/win32/riched32/CMakeLists.txt b/reactos/dll/win32/riched32/CMakeLists.txt index 0ad88dad648..850bb5e82ea 100644 --- a/reactos/dll/win32/riched32/CMakeLists.txt +++ b/reactos/dll/win32/riched32/CMakeLists.txt @@ -1,16 +1,13 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(riched32.dll riched32.spec) list(APPEND SOURCE richedit.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/riched32.def) -add_library(riched32 SHARED ${SOURCE}) - +add_library(riched32 SHARED ${SOURCE} version.rc) set_module_type(riched32 win32dll) target_link_libraries(riched32 wine) add_importlibs(riched32 riched20 user32 msvcrt kernel32 ntdll) diff --git a/reactos/dll/win32/riched32/richedit.c b/reactos/dll/win32/riched32/richedit.c index 76a014c437f..bf4d3f11975 100644 --- a/reactos/dll/win32/riched32/richedit.c +++ b/reactos/dll/win32/riched32/richedit.c @@ -44,16 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); extern LRESULT WINAPI RichEdit10ANSIWndProc(HWND, UINT, WPARAM, LPARAM); -/* Unregisters the window class. */ -static BOOL RICHED32_Unregister(void) -{ - TRACE("\n"); - - UnregisterClassA(RICHEDIT_CLASS10A, NULL); - return TRUE; -} - - /* Registers the window class. */ static BOOL RICHED32_Register(void) { @@ -84,7 +74,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return RICHED32_Register(); case DLL_PROCESS_DETACH: - return RICHED32_Unregister(); + if (lpvReserved) break; + UnregisterClassA(RICHEDIT_CLASS10A, NULL); + break; } return TRUE; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 453ecd490ac..dab7730e28c 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -162,7 +162,7 @@ reactos/dll/win32/query # Synced to Wine-1.7.1 reactos/dll/win32/rasapi32 # Synced to Wine-1.5.4 reactos/dll/win32/resutils # Synced to Wine-1.5.19 reactos/dll/win32/riched20 # Synced to Wine-1.7.1 -reactos/dll/win32/riched32 # Synced to Wine-1.5.19 +reactos/dll/win32/riched32 # Synced to Wine-1.7.1 reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26 reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Synced to Wine-1.5.4 -- 2.17.1