[RICHED32]
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 26 Sep 2013 16:33:17 +0000 (16:33 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 26 Sep 2013 16:33:17 +0000 (16:33 +0000)
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60371

reactos/dll/win32/riched32/CMakeLists.txt
reactos/dll/win32/riched32/richedit.c
reactos/media/doc/README.WINE

index 0ad88da..850bb5e 100644 (file)
@@ -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)
index 76a014c..bf4d3f1 100644 (file)
@@ -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;
 }
index 453ecd4..dab7730 100644 (file)
@@ -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