From 2862b744a03b68c8b7004f7e33b2a996da881850 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 21 Sep 2013 00:14:27 +0000 Subject: [PATCH] [LOCALUI] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60255 --- reactos/dll/win32/localui/CMakeLists.txt | 5 ++--- reactos/dll/win32/localui/localui.c | 2 +- reactos/media/doc/README.WINE | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/localui/CMakeLists.txt b/reactos/dll/win32/localui/CMakeLists.txt index 43ff2f27fb3..1d0fba7eb92 100644 --- a/reactos/dll/win32/localui/CMakeLists.txt +++ b/reactos/dll/win32/localui/CMakeLists.txt @@ -5,11 +5,10 @@ spec2def(localui.dll localui.spec) 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) diff --git a/reactos/dll/win32/localui/localui.c b/reactos/dll/win32/localui/localui.c index 97c83d30061..d58e5074678 100644 --- a/reactos/dll/win32/localui/localui.c +++ b/reactos/dll/win32/localui/localui.c @@ -124,7 +124,7 @@ static BOOL dlg_configure_com(HANDLE hXcv, HWND hWnd, PCWSTR pPortName) 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, diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 30ebb1ea53a..c667ffabe36 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -94,7 +94,7 @@ reactos/dll/win32/itss # Synced to Wine-1.7.1 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