[ros-diffs] [akhaldi] 60363: [PSTOREC] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Thu Sep 26 14:07:55 2013
New Revision: 60363

URL: http://svn.reactos.org/svn/reactos?rev=60363&view=rev
Log:
[PSTOREC]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/win32/pstorec/CMakeLists.txt
    trunk/reactos/dll/win32/pstorec/pstorec.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/pstorec/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/pstorec/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/pstorec/CMakeLists.txt	[iso-8859-1] Thu Sep 26 14:07:55 2013
@@ -1,16 +1,15 @@
 
-add_typelib(pstorec_tlb.idl)
 add_definitions(-D__WINESRC__)
 spec2def(pstorec.dll pstorec.spec)
 
 list(APPEND SOURCE
     pstorec.c
-    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/pstorec_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/pstorec.def)
 
+add_typelib(pstorec_tlb.idl)
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/pstorec_tlb.tlb)
-add_library(pstorec SHARED ${SOURCE})
+add_library(pstorec SHARED ${SOURCE} rsrc.rc)
 set_module_type(pstorec win32dll)
 target_link_libraries(pstorec uuid wine)
 add_importlibs(pstorec msvcrt kernel32 ntdll)

Modified: trunk/reactos/dll/win32/pstorec/pstorec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.…
==============================================================================
--- trunk/reactos/dll/win32/pstorec/pstorec.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/pstorec/pstorec.c	[iso-8859-1] Thu Sep 26 14:07:55 2013
@@ -56,8 +56,6 @@
         return FALSE;  /* prefer native version */
     case DLL_PROCESS_ATTACH:
         DisableThreadLibraryCalls(hinst);
-        break;
-    case DLL_PROCESS_DETACH:
         break;
     }
     return TRUE;
@@ -398,5 +396,5 @@
 
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-    return S_OK;
-}
+    return S_FALSE;
+}

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Thu Sep 26 14:07:55 2013
@@ -155,7 +155,7 @@
 reactos/dll/win32/powrprof        # Forked at Wine-1.0rc5
 reactos/dll/win32/printui         # Synced to Wine-1.7.1
 reactos/dll/win32/propsys         # Synced to Wine-1.5.26
-reactos/dll/win32/pstorec         # Synced to Wine-1.5.4
+reactos/dll/win32/pstorec         # Synced to Wine-1.7.1
 reactos/dll/win32/qmgr            # Synced to Wine-1.5.26
 reactos/dll/win32/qmgrprxy        # Synced to Wine-1.5.26
 reactos/dll/win32/query           # Synced to Wine-1.5.19