Sync with trunk r63502.

[reactos.git] / dll / cpl / appwiz / createlink.c

diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c
index 361d354..361ca15 100644 (file)
--- a/dll/cpl/appwiz/createlink.c
+++ b/dll/cpl/appwiz/createlink.c
@@ -11,6 +11,8 @@
 
 #include "appwiz.h"
 
+#include <tchar.h>
+
 BOOL
 IsShortcut(HKEY hKey)
 {
@@ -224,11 +226,7 @@ WelcomeDlgProc(HWND hwndDlg,
                         LoadStringW(hApplet, IDS_ERROR_NOT_FOUND, szPath, MAX_PATH) < MAX_PATH)
                     {
                         WCHAR szError[MAX_PATH + 100];
-#ifdef _MSC_VER
-                        _swprintf(szError, szPath, pContext->szTarget);
-#else
                         swprintf(szError, szPath, pContext->szTarget);
-#endif
                         MessageBoxW(hwndDlg, szError, szDesc, MB_ICONERROR);
                     }
                     SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1);
@@ -362,14 +360,14 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath)
     psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
     psp.hInstance = hApplet;
     psp.pfnDlgProc = WelcomeDlgProc;
-    psp.pszTemplate = MAKEINTRESOURCE(IDD_SHORTCUT_LOCATION);
+    psp.pszTemplate = MAKEINTRESOURCEW(IDD_SHORTCUT_LOCATION);
     psp.lParam = (LPARAM)pContext;
     ahpsp[nPages++] = CreatePropertySheetPage(&psp);
 
     /* Create the Finish page */
     psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
     psp.pfnDlgProc = FinishDlgProc;
-    psp.pszTemplate = MAKEINTRESOURCE(IDD_SHORTCUT_FINISH);
+    psp.pszTemplate = MAKEINTRESOURCEW(IDD_SHORTCUT_FINISH);
     ahpsp[nPages++] = CreatePropertySheetPage(&psp);
 
 
@@ -381,7 +379,7 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath)
     psh.nPages = nPages;
     psh.nStartPage = 0;
     psh.phpage = ahpsp;
-    psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK);
+    psh.pszbmWatermark = MAKEINTRESOURCEW(IDB_WATERMARK);
 
     /* Display the wizard */
     PropertySheet(&psh);
@@ -389,21 +387,6 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath)
     return TRUE;
 }
 
-
-LONG
-CALLBACK
-NewLinkHere(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
-{
-    WCHAR szFile[MAX_PATH];
-
-    if (MultiByteToWideChar(CP_ACP, 0, (LPSTR) lParam1, -1, szFile, MAX_PATH))
-    {
-        return ShowCreateShortcutWizard(hwndCPl, szFile);
-    }
-    return -1;
-}
-
-
 LONG
 CALLBACK
 NewLinkHereW(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)