[ros-diffs] [akhaldi] 59228: [QMGRPRXY] * Sync with Wine 1.5.26.

Author: akhaldi
Date: Sun Jun 16 11:11:48 2013
New Revision: 59228

URL: http://svn.reactos.org/svn/reactos?rev=59228&view=rev
Log:
[QMGRPRXY]
* Sync with Wine 1.5.26.

Added:
    trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.rc
      - copied unchanged from r59223, trunk/reactos/dll/win32/qmgrprxy/version.rc
Removed:
    trunk/reactos/dll/win32/qmgrprxy/version.rc
Modified:
    trunk/reactos/dll/win32/qmgrprxy/CMakeLists.txt
    trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.idl
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/qmgrprxy/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgrprxy/CMakeLis...
==============================================================================
--- trunk/reactos/dll/win32/qmgrprxy/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgrprxy/CMakeLists.txt	[iso-8859-1] Sun Jun 16 11:11:48 2013
@@ -1,7 +1,7 @@

add_definitions(
     -D__WINESRC__
-    -DREGISTER_PROXY_DLL)
+    -DWINE_REGISTER_DLL)

include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

@@ -12,7 +12,7 @@
 add_rpcproxy_files(qmgrprxy.idl)

list(APPEND SOURCE
-    version.rc
+    qmgrprxy.rc
     ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_i.c
     ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c

Modified: trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgrprxy/qmgrprxy...
==============================================================================
--- trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.idl	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.idl	[iso-8859-1] Sun Jun 16 11:11:48 2013
@@ -20,3 +20,9 @@

#define DO_NO_IMPORTS
 #include "bits1_5.idl"
+
+[
+    threading(both),
+    uuid(5ce34c0d-0dc9-4c1f-897c-daa1b78cee7c)  /* IBackgroundCopyManager */
+]
+coclass PSFactoryBuffer { interface IFactoryBuffer; }

Removed: trunk/reactos/dll/win32/qmgrprxy/version.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgrprxy/version....
==============================================================================
--- trunk/reactos/dll/win32/qmgrprxy/version.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgrprxy/version.rc	(removed)
@@ -1,4 +0,0 @@
-#define WINE_OLESELFREGISTER
-#define WINE_FILENAME_STR "qmgrprxy.dll"
-
-#include <wine/wine_common_ver.rc>

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=5...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Jun 16 11:11:48 2013
@@ -146,8 +146,8 @@
 reactos/dll/win32/printui         # Synced to Wine-1.5.4
 reactos/dll/win32/propsys         # Synced to Wine-1.5.26
 reactos/dll/win32/pstorec         # Synced to Wine-1.5.4
-reactos/dll/win32/qmgr            # Synced to Wine-1.5-26
-reactos/dll/win32/qmgrprxy        # Synced to Wine-1.14?
+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
 reactos/dll/win32/rasapi32        # Synced to Wine-1.5.4
 reactos/dll/win32/resutils        # Synced to Wine-1.5.19