[ros-diffs] [akhaldi] 60364: [QMGR] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Thu Sep 26 14:09:59 2013
New Revision: 60364

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

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

Modified: trunk/reactos/dll/win32/qmgr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/CMakeLists.…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/CMakeLists.txt	[iso-8859-1] Thu Sep 26 14:09:59 2013
@@ -13,11 +13,10 @@
     qmgr.c
     qmgr_main.c
     service.c
-    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/qmgr_local_i.c
     ${CMAKE_CURRENT_BINARY_DIR}/qmgr.def)
 
-add_library(qmgr SHARED ${SOURCE})
+add_library(qmgr SHARED ${SOURCE} rsrc.rc)
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/qmgr.inf)
 add_idl_headers(qmgr_idlheader qmgr_local.idl)
 set_module_type(qmgr win32dll)

Modified: trunk/reactos/dll/win32/qmgr/qmgr_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr_main.c…
==============================================================================
--- trunk/reactos/dll/win32/qmgr/qmgr_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/qmgr_main.c	[iso-8859-1] Thu Sep 26 14:09:59 2013
@@ -62,8 +62,6 @@
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(hinstDLL);
             hInst = hinstDLL;
-            break;
-        case DLL_PROCESS_DETACH:
             break;
     }
 

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:09:59 2013
@@ -156,7 +156,7 @@
 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.7.1
-reactos/dll/win32/qmgr            # Synced to Wine-1.5.26
+reactos/dll/win32/qmgr            # Synced to Wine-1.7.1
 reactos/dll/win32/qmgrprxy        # Synced to Wine-1.5.26
 reactos/dll/win32/query           # Synced to Wine-1.5.19
 reactos/dll/win32/rasapi32        # Synced to Wine-1.5.4