[ros-diffs] [zguo] 61910: [0.3.16] Merge hackfix for VLC.

Author: zguo
Date: Sat Feb  1 22:37:23 2014
New Revision: 61910

URL: http://svn.reactos.org/svn/reactos?rev=61910&view=rev
Log:
[0.3.16]
Merge hackfix for VLC.

Modified:
    branches/ReactOS-0.3.16/   (props changed)
    branches/ReactOS-0.3.16/reactos/   (props changed)
    branches/ReactOS-0.3.16/reactos/cmake/baseaddress.cmake

Propchange: branches/ReactOS-0.3.16/
------------------------------------------------------------------------------
    svn:mergeinfo = /trunk:61898

Propchange: branches/ReactOS-0.3.16/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sat Feb  1 22:37:23 2014
@@ -16,3 +16,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
+/trunk/reactos:61898

Modified: branches/ReactOS-0.3.16/reactos/cmake/baseaddress.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.16/reactos/cmake/ba…
==============================================================================
--- branches/ReactOS-0.3.16/reactos/cmake/baseaddress.cmake	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.16/reactos/cmake/baseaddress.cmake	[iso-8859-1] Sat Feb  1
22:37:23 2014
@@ -283,7 +283,7 @@
 set(baseaddress_ws2_32_new           0x70790000)
 set(baseaddress_wshirda              0x70760000)
 set(baseaddress_wshtcpip             0x70730000)
-set(baseaddress_wsock32              0x70700000)
+set(baseaddress_wsock32              0x78700000)  # FIXME: hackfix for VLC player
 set(baseaddress_wtsapi32             0x706d0000)
 set(baseaddress_wuapi                0x70690000)
 set(baseaddress_xinput1_1            0x70660000)