[dchapyshev] 38614: - Small fix for Russian translation - More dialogs implement - LPTSTR -> LPWSTR
Author: dchapyshev Date: Tue Jan 6 13:28:04 2009 New Revision: 38614
URL: http://svn.reactos.org/svn/reactos?rev=38614&view=rev Log: - Small fix for Russian translation - More dialogs implement - LPTSTR -> LPWSTR
Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc
Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?rev... ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Tue Jan 6 13:28:04 2009 @@ -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 <tchar.h> #include <stdio.h>
+#define NDEBUG +#include <debug.h> + #include "resource.h" #include "hdwwiz.h"
+ HINSTANCE hApplet = NULL;
typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); @@ -60,12 +64,67 @@ 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 @@ }
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); }
Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuil... ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild [iso-8859-1] Tue Jan 6 13:28:04 2009 @@ -6,6 +6,7 @@ <library>setupapi</library> <library>kernel32</library> <library>comctl32</library> + <library>user32</library> <file>hdwwiz.c</file> <file>hdwwiz.rc</file> </module>
Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec?... ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec [iso-8859-1] Tue Jan 6 13:28:04 2009 @@ -1,3 +1,3 @@ -@ stdcall AddHardwareWizard(ptr str) +@ stdcall AddHardwareWizard(ptr wstr) @ stdcall CPlApplet(ptr long ptr ptr) @ stdcall InstallNewDevice(ptr ptr ptr)
Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.r... ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] Tue Jan 6 13:28:04 2009 @@ -41,7 +41,7 @@ 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
-
dchapyshev＠svn.reactos.org