Alexandre Julliard : oledlg: Build with msvcrt.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Tue Jun 18 09:00:11 2019 +0200

oledlg: Build with msvcrt.

Signed-off-by: Alexandre Julliard

---

dlls/oledlg/Makefile.in   | 2 ++
 dlls/oledlg/insobjdlg.c   | 1 -
 dlls/oledlg/oledlg_main.c | 1 -
 dlls/oledlg/pastespl.c    | 9 ++++-----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in
index 4a16469..ee54844 100644
--- a/dlls/oledlg/Makefile.in
+++ b/dlls/oledlg/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = oledlg.dll
 IMPORTLIB = oledlg
 IMPORTS   = ole32 comdlg32 user32 advapi32

+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
    insobjdlg.c \
    oledlg_main.c \
diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c
index 00b991e..18919b2 100644
--- a/dlls/oledlg/insobjdlg.c
+++ b/dlls/oledlg/insobjdlg.c
@@ -29,7 +29,6 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/debug.h"
-#include "wine/unicode.h"

#include "oledlg.h"
 #include "resource.h"
diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c
index ba5b7c8..df53ad7 100644
--- a/dlls/oledlg/oledlg_main.c
+++ b/dlls/oledlg/oledlg_main.c
@@ -33,7 +33,6 @@
 #include "resource.h"

#include "wine/debug.h"
-#include "wine/unicode.h"

WINE_DEFAULT_DEBUG_CHANNEL(ole);

diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c
index 0b8c8c9..2593fd5 100644
--- a/dlls/oledlg/pastespl.c
+++ b/dlls/oledlg/pastespl.c
@@ -35,7 +35,6 @@
 #include "resource.h"

#include "wine/debug.h"
-#include "wine/unicode.h"

WINE_DEFAULT_DEBUG_CHANNEL(ole);

@@ -432,15 +431,15 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct)
     }

LoadStringW(OLEDLG_hInstance, res_id, resource_txt, ARRAY_SIZE(resource_txt));
-    if((ptr = strstrW(resource_txt, percent_s)))
+    if((ptr = wcsstr(resource_txt, percent_s)))
     {
         /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}.  Else sub appropriate type name */
-        size_t result_txt_len = strlenW(pent->lpstrResultText);
+        size_t result_txt_len = lstrlenW(pent->lpstrResultText);
         ptrdiff_t offs = (char*)ptr - (char*)resource_txt;
-        result_txt = HeapAlloc(GetProcessHeap(), 0, (strlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR));
+        result_txt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR));
         memcpy(result_txt, resource_txt, offs);
         memcpy((char*)result_txt + offs, pent->lpstrResultText, result_txt_len * sizeof(WCHAR));
-        memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (strlenW(ptr + 2) + 1) * sizeof(WCHAR));
+        memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (lstrlenW(ptr + 2) + 1) * sizeof(WCHAR));
     }
     else
         result_txt = resource_txt;