From bb3766a0a4416c7bd081903b6cfcf89c662b2d7e Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 26 Sep 2013 14:07:55 +0000
Subject: [PATCH] [PSTOREC] * Sync with Wine 1.7.1. CORE-7469

svn path=/trunk/; revision=60363
---
 reactos/dll/win32/pstorec/CMakeLists.txt | 5 ++---
 reactos/dll/win32/pstorec/pstorec.c      | 4 +---
 reactos/media/doc/README.WINE            | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/reactos/dll/win32/pstorec/CMakeLists.txt b/reactos/dll/win32/pstorec/CMakeLists.txt
index 4ec8a8a881a..b8b65da1918 100644
--- a/reactos/dll/win32/pstorec/CMakeLists.txt
+++ b/reactos/dll/win32/pstorec/CMakeLists.txt
@@ -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)
diff --git a/reactos/dll/win32/pstorec/pstorec.c b/reactos/dll/win32/pstorec/pstorec.c
index cf3bfbed265..6dac3d6b23a 100644
--- a/reactos/dll/win32/pstorec/pstorec.c
+++ b/reactos/dll/win32/pstorec/pstorec.c
@@ -57,8 +57,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
     case DLL_PROCESS_ATTACH:
         DisableThreadLibraryCalls(hinst);
         break;
-    case DLL_PROCESS_DETACH:
-        break;
     }
     return TRUE;
 }
@@ -398,5 +396,5 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
 
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-    return S_OK;
+    return S_FALSE;
 }
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 70f134a820d..e2026a97ce1 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -155,7 +155,7 @@ reactos/dll/win32/pidgen          # Synced to Wine-1.5.19
 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