Author: akhaldi Date: Thu Sep 26 16:33:17 2013 New Revision: 60371
URL: http://svn.reactos.org/svn/reactos?rev=60371&view=rev Log: [RICHED32] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/reactos/dll/win32/riched32/CMakeLists.txt trunk/reactos/dll/win32/riched32/richedit.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/riched32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched32/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/riched32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched32/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:33:17 2013 @@ -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)
Modified: trunk/reactos/dll/win32/riched32/richedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched32/richedit... ============================================================================== --- trunk/reactos/dll/win32/riched32/richedit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched32/richedit.c [iso-8859-1] Thu Sep 26 16:33:17 2013 @@ -44,16 +44,6 @@ 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 @@ return RICHED32_Register();
case DLL_PROCESS_DETACH: - return RICHED32_Unregister(); + if (lpvReserved) break; + UnregisterClassA(RICHEDIT_CLASS10A, NULL); + break; } return TRUE; }
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 26 16:33:17 2013 @@ -162,7 +162,7 @@ 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