appwiz.cpl: Build with msvcrt.

dlls/appwiz.cpl/Makefile.in

@@ -2,6 +2,8 @@ MODULE    = appwiz.cpl
 IMPORTS   = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 bcrypt
 DELAYIMPORTS = msi
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	addons.c \
 	appwiz.c

dlls/appwiz.cpl/appwiz.c

@@ -25,9 +25,6 @@
 
 #define NONAMELESSUNION
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -42,7 +39,6 @@
 #include <commdlg.h>
 #include <cpl.h>
 
-#include "wine/unicode.h"
 #include "wine/list.h"
 #include "wine/debug.h"
 #include "appwiz.h"
@@ -249,12 +245,12 @@ static BOOL ReadApplicationsFromRegistry(HKEY root)
                     &displen);
 
                 /* separate the index from the icon name, if supplied */
-                iconPtr = strchrW(info->icon, ',');
+                iconPtr = wcschr(info->icon, ',');
 
                 if (iconPtr)
                 {
                     *iconPtr++ = 0;
-                    info->iconIdx = atoiW(iconPtr);
+                    info->iconIdx = wcstol(iconPtr, NULL, 10);
                 }
             }
 
@@ -459,7 +455,7 @@ static void InstallProgram(HWND hWnd)
     LoadStringW(hInst, IDS_FILTER_PROGRAMS, filter_programs, ARRAY_SIZE(filter_programs));
     LoadStringW(hInst, IDS_FILTER_ALL, filter_all, ARRAY_SIZE(filter_all));
 
-    snprintfW( FilterBufferW, MAX_PATH, filters, filter_installs, 0, 0,
+    swprintf( FilterBufferW, MAX_PATH, filters, filter_installs, 0, 0,
                filter_programs, 0, 0, filter_all, 0, 0 );
     memset(&ofn, 0, sizeof(OPENFILENAMEW));
     ofn.lStructSize = sizeof(OPENFILENAMEW);
@@ -969,12 +965,12 @@ static LONG start_params(const WCHAR *params)
     if(!params)
         return FALSE;
 
-    if(!strcmpW(params, install_geckoW)) {
+    if(!wcscmp(params, install_geckoW)) {
         install_addon(ADDON_GECKO);
         return TRUE;
     }
 
-    if(!strcmpW(params, install_monoW)) {
+    if(!wcscmp(params, install_monoW)) {
         install_addon(ADDON_MONO);
         return TRUE;
     }

dlls/appwiz.cpl/appwiz.h

@@ -17,7 +17,7 @@
  */
 
 #include "wine/heap.h"
-#include "wine/unicode.h"
+#include "winnls.h"
 
 typedef enum {
     ADDON_GECKO,
@@ -33,7 +33,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *str)
     WCHAR *ret;
 
     if(str) {
-        size_t size = strlenW(str)+1;
+        size_t size = lstrlenW(str)+1;
         ret = heap_alloc(size*sizeof(WCHAR));
         if(ret)
             memcpy(ret, str, size*sizeof(WCHAR));