[ros-diffs] [akhaldi] 73936: [DPLAYX] Sync with Wine Staging 2.2. CORE-12823 7603e85 dplayx: Don't print an error when no Lobby Providers are found. 7ae50b2 dplayx: Fix multiple assigments to the same lvalue (...

Author: akhaldi
Date: Sun Feb 26 16:41:39 2017
New Revision: 73936

URL: http://svn.reactos.org/svn/reactos?rev=73936&view=rev
Log:
[DPLAYX] Sync with Wine Staging 2.2. CORE-12823

7603e85 dplayx: Don't print an error when no Lobby Providers are found.
7ae50b2 dplayx: Fix multiple assigments to the same lvalue (coccinellery).

Modified:
    trunk/reactos/dll/directx/wine/dplayx/dplay.c
    trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp…
==============================================================================
--- trunk/reactos/dll/directx/wine/dplayx/dplay.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dplayx/dplay.c	[iso-8859-1] Sun Feb 26 16:41:39 2017
@@ -4355,8 +4355,7 @@
     if( RegOpenKeyExA( HKEY_LOCAL_MACHINE, searchSubKey,
                          0, KEY_READ, &hkResult ) != ERROR_SUCCESS )
     {
-      /* Hmmm. Does this mean that there are no service providers? */
-      ERR(": no service providers?\n");
+      TRACE("No Lobby Providers have been registered.\n");
       return DP_OK;
     }
 

Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp…
==============================================================================
--- trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c	[iso-8859-1] Sun Feb 26
16:41:39 2017
@@ -287,10 +287,10 @@
 
   lpMsgBody->dpidAppServer2 = dpidServer;
   lpMsgBody->unknown3[0] = 0x0;
-  lpMsgBody->unknown3[0] = 0x0;
-  lpMsgBody->unknown3[0] = 0x20;
-  lpMsgBody->unknown3[0] = 0x0;
-  lpMsgBody->unknown3[0] = 0x0;
+  lpMsgBody->unknown3[1] = 0x0;
+  lpMsgBody->unknown3[2] = 0x20;
+  lpMsgBody->unknown3[3] = 0x0;
+  lpMsgBody->unknown3[4] = 0x0;
 
   lpMsgBody->dpidAppServer3 = dpidServer;
   lpMsgBody->unknown4[0] =  0x30;

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] Sun Feb 26 16:41:39 2017
@@ -34,7 +34,7 @@
 reactos/dll/directx/wine/dinput8        # Synced to WineStaging-1.9.23
 reactos/dll/directx/wine/dmusic         # Synced to WineStaging-1.9.23
 reactos/dll/directx/wine/dplay          # Synced to WineStaging-1.9.23
-reactos/dll/directx/wine/dplayx         # Synced to WineStaging-1.9.23
+reactos/dll/directx/wine/dplayx         # Synced to WineStaging-2.2
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.3.29
 reactos/dll/directx/wine/dxdiagn        # Synced to WineStaging-1.9.23
 reactos/dll/directx/wine/msdmo          # Synced to WineStaging-1.9.23