Alexandre Julliard : oleacc: Build with msvcrt.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Jun 17 09:37:11 2019 +0200

oleacc: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/oleacc/Makefile.in |  2 ++
 dlls/oleacc/client.c    |  1 -
 dlls/oleacc/main.c      | 11 +++++------
 dlls/oleacc/window.c    |  1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in
index 331229f..c8e2a30 100644
--- a/dlls/oleacc/Makefile.in
+++ b/dlls/oleacc/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = oleacc.dll
 IMPORTLIB = oleacc
 IMPORTS   = uuid oleaut32 ole32 user32 rpcrt4
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	client.c \
 	main.c \
diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c
index 0d313a2..1d43ec3 100644
--- a/dlls/oleacc/client.c
+++ b/dlls/oleacc/client.c
@@ -20,7 +20,6 @@
 
 #include "oleacc_private.h"
 
-#include "wine/unicode.h"
 #include "wine/debug.h"
 #include "wine/heap.h"
 
diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c
index b90bc2c..f26abbd 100644
--- a/dlls/oleacc/main.c
+++ b/dlls/oleacc/main.c
@@ -31,7 +31,6 @@
 #include "oleacc_private.h"
 #include "resource.h"
 
-#include "wine/unicode.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(oleacc);
@@ -114,7 +113,7 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid)
     TRACE("got window class: %s\n", debugstr_w(class_name));
 
     for(i=0; i<ARRAY_SIZE(builtin_classes); i++) {
-        if(!strcmpiW(class_name, builtin_classes[i].name)) {
+        if(!wcsicmp(class_name, builtin_classes[i].name)) {
             accessible_create ret;
 
             ret = (objid==OBJID_CLIENT ?
@@ -198,13 +197,13 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo
     if(memcmp(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)))
         return E_FAIL;
     p = atom_str + ARRAY_SIZE(lresult_atom_prefix);
-    proc_id = strtoulW(p, &p, 16);
+    proc_id = wcstoul(p, &p, 16);
     if(*p != ':')
         return E_FAIL;
-    server_mapping = ULongToHandle( strtoulW(p+1, &p, 16) );
+    server_mapping = ULongToHandle( wcstoul(p+1, &p, 16) );
     if(*p != ':')
         return E_FAIL;
-    size = strtoulW(p+1, &p, 16);
+    size = wcstoul(p+1, &p, 16);
     if(*p != 0)
         return E_FAIL;
 
@@ -320,7 +319,7 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc )
     }
 
     memcpy(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix));
-    sprintfW(atom_str+ARRAY_SIZE(lresult_atom_prefix), atom_fmt, GetCurrentProcessId(),
+    swprintf(atom_str+ARRAY_SIZE(lresult_atom_prefix), 3*8 + 3, atom_fmt, GetCurrentProcessId(),
              HandleToUlong(mapping), stat.cbSize.u.LowPart);
     atom = GlobalAddAtomW(atom_str);
     if(!atom) {
diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c
index 32c19fd..5957d49 100644
--- a/dlls/oleacc/window.c
+++ b/dlls/oleacc/window.c
@@ -20,7 +20,6 @@
 
 #include "oleacc_private.h"
 
-#include "wine/unicode.h"
 #include "wine/debug.h"
 #include "wine/heap.h"