[akhaldi] 60255: [LOCALUI] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sat Sep 21 00:14:27 2013
New Revision: 60255

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

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

Modified: trunk/reactos/dll/win32/localui/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/localui/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/localui/CMakeLists.txt	[iso-8859-1] Sat Sep 21 00:14:27 2013
@@ -5,11 +5,10 @@
 
 list(APPEND SOURCE
     localui.c
-    localui.rc
     ${CMAKE_CURRENT_BINARY_DIR}/localui.def)
 
-add_library(localui SHARED ${SOURCE})
+add_library(localui SHARED ${SOURCE} localui.rc)
 set_module_type(localui win32dll)
-target_link_libraries(localui uuid wine)
+target_link_libraries(localui wine)
 add_importlibs(localui winspool user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET localui DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/localui/localui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.…
==============================================================================
--- trunk/reactos/dll/win32/localui/localui.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/localui/localui.c	[iso-8859-1] Sat Sep 21 00:14:27 2013
@@ -124,7 +124,7 @@
         shortname[len-1] = '\0';
 
         /* get current settings */
-        len = sizeof(cfg);
+        len = FIELD_OFFSET(COMMCONFIG, wcProviderData[1]);
         status = ERROR_SUCCESS;
         res = XcvDataW( hXcv, cmd_GetDefaultCommConfigW,
                         (PBYTE) shortname,

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] Sat Sep 21 00:14:27 2013
@@ -94,7 +94,7 @@
 reactos/dll/win32/jscript         # Synced to Wine-1.7.1
 reactos/dll/win32/loadperf        # Synced to Wine-1.7.1
 reactos/dll/win32/localspl        # Synced to Wine-1.5.26
-reactos/dll/win32/localui         # Synced to Wine-1.5.19
+reactos/dll/win32/localui         # Synced to Wine-1.7.1
 reactos/dll/win32/lz32            # Synced to Wine-1.5.19
 reactos/dll/win32/mapi32          # Autosync
 reactos/dll/win32/mciavi32        # Synced to Wine-1.5.4