From c92aee877220acdb05d03e8dea3afdfc478a6b42 Mon Sep 17 00:00:00 2001 From: Dmitry Chapyshev Date: Tue, 6 Jan 2009 19:28:04 +0000 Subject: [PATCH] - Small fix for Russian translation - More dialogs implement - LPTSTR -> LPWSTR svn path=/trunk/; revision=38614 --- reactos/dll/cpl/hdwwiz/hdwwiz.c | 69 +++++++++++++++++++++++++++- reactos/dll/cpl/hdwwiz/hdwwiz.rbuild | 1 + reactos/dll/cpl/hdwwiz/hdwwiz.spec | 2 +- reactos/dll/cpl/hdwwiz/lang/ru-RU.rc | 2 +- 4 files changed, 70 insertions(+), 4 deletions(-) diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.c b/reactos/dll/cpl/hdwwiz/hdwwiz.c index 69ce4216573..8275b7a4d26 100644 --- a/reactos/dll/cpl/hdwwiz/hdwwiz.c +++ b/reactos/dll/cpl/hdwwiz/hdwwiz.c @@ -1,6 +1,6 @@ /* * ReactOS New devices installation - * Copyright (C) 2005 ReactOS Team + * Copyright (C) 2005, 2008 ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,9 +31,13 @@ #include #include +#define NDEBUG +#include + #include "resource.h" #include "hdwwiz.h" + HINSTANCE hApplet = NULL; typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); @@ -60,12 +64,67 @@ SearchPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) static INT_PTR CALLBACK IsConnctedPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + switch (uMsg) + { + case WM_COMMAND: + { + if(HIWORD(wParam) == BN_CLICKED) + { + if ((SendDlgItemMessage(hwndDlg, IDC_CONNECTED, BM_GETCHECK, 0, 0) == BST_CHECKED) || + (SendDlgItemMessage(hwndDlg, IDC_NOTCONNECTED, BM_GETCHECK, 0, 0) == BST_CHECKED)) + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + } + else + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + } + } + } + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + { + /* Disable "Next" button */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + } + break; + } + } + break; + } + return FALSE; } static INT_PTR CALLBACK FinishPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + switch (uMsg) + { + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + { + /* Only "Finish" button */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + } + break; + } + } + break; + } + return FALSE; } @@ -133,8 +192,14 @@ HardwareWizardInit(HWND hwnd) } VOID CALLBACK -AddHardwareWizard(HWND hwnd, LPTSTR lpName) +AddHardwareWizard(HWND hwnd, LPWSTR lpName) { + if (lpName != NULL) + { + DPRINT1("No support of remote installation yet!\n"); + return; + } + HardwareWizardInit(hwnd); } diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild index 7ce8c2e57a0..0a36d906eed 100644 --- a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild +++ b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild @@ -6,6 +6,7 @@ setupapi kernel32 comctl32 + user32 hdwwiz.c hdwwiz.rc diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.spec b/reactos/dll/cpl/hdwwiz/hdwwiz.spec index 77a26854555..18e83944392 100644 --- a/reactos/dll/cpl/hdwwiz/hdwwiz.spec +++ b/reactos/dll/cpl/hdwwiz/hdwwiz.spec @@ -1,3 +1,3 @@ -@ stdcall AddHardwareWizard(ptr str) +@ stdcall AddHardwareWizard(ptr wstr) @ stdcall CPlApplet(ptr long ptr ptr) @ stdcall InstallNewDevice(ptr ptr ptr) diff --git a/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc b/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc index e7bf4723f05..937be6d6681 100644 --- a/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc +++ b/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc @@ -41,7 +41,7 @@ BEGIN LTEXT "Мастер установки оборудования", IDC_FINISHTITLE, 114, 8, 203, 24 LTEXT "Работа мастера установки оборудования успешно завершена.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "Для закрытия мастера нажмите кнопку ""Готово"".", -1, 114, 166, 132, 8 + LTEXT "Для закрытия мастера нажмите кнопку ""Готово"".", -1, 114, 166, 190, 8 END STRINGTABLE