Alexandre Julliard : serialui: Build with msvcrt.

Alexandre Julliard julliard at winehq.org
Thu Jun 20 16:04:16 CDT 2019


Module: wine
Branch: master
Commit: 0fb1d847e1421fe0e323e54efc257b2262cfd6ec
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0fb1d847e1421fe0e323e54efc257b2262cfd6ec

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 20 09:09:50 2019 +0200

serialui: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/serialui/Makefile.in |  2 ++
 dlls/serialui/confdlg.c   | 11 ++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in
index 6c22afd..2f1377f 100644
--- a/dlls/serialui/Makefile.in
+++ b/dlls/serialui/Makefile.in
@@ -1,6 +1,8 @@
 MODULE    = serialui.dll
 IMPORTS   = user32 advapi32
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	confdlg.c
 
diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c
index cc33505..45419ed 100644
--- a/dlls/serialui/confdlg.c
+++ b/dlls/serialui/confdlg.c
@@ -28,16 +28,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-#include "wine/unicode.h"
-
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
 
 #include "windef.h"
 #include "winbase.h"
+#include "winnls.h"
 #include "winreg.h"
 #include "wingdi.h"
 #include "winuser.h"
@@ -353,7 +350,7 @@ static INT_PTR CALLBACK SERIALUI_ConfigDialogProc(HWND hWnd, UINT uMsg, WPARAM w
             return FALSE;
         SetWindowLongPtrW(hWnd, DWLP_USER, lParam);
         GetWindowTextW(hWnd, format, ARRAY_SIZE(format));
-        snprintfW(szTitle, ARRAY_SIZE(szTitle), format, info->lpszDevice);
+        swprintf(szTitle, ARRAY_SIZE(szTitle), format, info->lpszDevice);
         SetWindowTextW(hWnd, szTitle);
         SERIALUI_DCBToDialogInfo(hWnd, info);
         return TRUE;
@@ -501,7 +498,7 @@ BOOL WINAPI drvSetDefaultCommConfigW(
     if(r != ERROR_SUCCESS)
         return FALSE;
 
-    snprintfW(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice);
+    swprintf(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice);
     r = RegCreateKeyW(hKeyReg, szKeyName, &hKeyPort);
     if(r == ERROR_SUCCESS)
     {
@@ -574,7 +571,7 @@ DWORD WINAPI drvGetDefaultCommConfigW(
     r = RegConnectRegistryW(NULL, HKEY_LOCAL_MACHINE, &hKeyReg);
     if(r != ERROR_SUCCESS) return r;
 
-    snprintfW(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice);
+    swprintf(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice);
     r = RegOpenKeyW(hKeyReg, szKeyName, &hKeyPort);
     if(r == ERROR_SUCCESS)
     {




More information about the wine-cvs mailing list