[ros-diffs] [janderwald] 34285: - add an empty dialog resource - implement initializing the dialog - fixes bug 3443

Author: janderwald
Date: Thu Jul  3 11:46:39 2008
New Revision: 34285

URL: http://svn.reactos.org/svn/reactos?rev=34285&view=rev
Log:
- add an empty dialog resource
- implement initializing the dialog
- fixes bug 3443

Modified:
    trunk/reactos/dll/cpl/telephon/lang/bg-BG.rc
    trunk/reactos/dll/cpl/telephon/lang/de-DE.rc
    trunk/reactos/dll/cpl/telephon/lang/el-GR.rc
    trunk/reactos/dll/cpl/telephon/lang/en-US.rc
    trunk/reactos/dll/cpl/telephon/lang/es-ES.rc
    trunk/reactos/dll/cpl/telephon/lang/fr-FR.rc
    trunk/reactos/dll/cpl/telephon/lang/it-IT.rc
    trunk/reactos/dll/cpl/telephon/lang/pl-PL.rc
    trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc
    trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc
    trunk/reactos/dll/cpl/telephon/lang/uk-UA.rc
    trunk/reactos/dll/cpl/telephon/resource.h
    trunk/reactos/dll/cpl/telephon/telephon.c

Modified: trunk/reactos/dll/cpl/telephon/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/bg-BG...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/lang/bg-BG.rc [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -1,4 +1,11 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+
+IDD_PROPPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+END

STRINGTABLE 
 BEGIN

Modified: trunk/reactos/dll/cpl/telephon/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/de-DE...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/lang/de-DE.rc [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -1,4 +1,11 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+END

STRINGTABLE 
 BEGIN

Modified: trunk/reactos/dll/cpl/telephon/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/el-GR...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/lang/el-GR.rc [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -1,4 +1,11 @@
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
+
+IDD_PROPPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+END

STRINGTABLE 
 BEGIN

Modified: trunk/reactos/dll/cpl/telephon/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/en-US...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/lang/en-US.rc [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -1,4 +1,11 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+IDD_PROPPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+END

STRINGTABLE 
 BEGIN

Modified: trunk/reactos/dll/cpl/telephon/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/es-ES...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/lang/es-ES.rc [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -1,4 +1,11 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+IDD_PROPPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+END

STRINGTABLE 
 BEGIN

Modified: trunk/reactos/dll/cpl/telephon/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/fr-FR...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/lang/fr-FR.rc [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -1,4 +1,11 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+IDD_PROPPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+END

STRINGTABLE 
 BEGIN

Modified: trunk/reactos/dll/cpl/telephon/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/it-IT...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/lang/it-IT.rc [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -1,4 +1,11 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+END

STRINGTABLE 
 BEGIN

Modified: trunk/reactos/dll/cpl/telephon/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/pl-PL...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/lang/pl-PL.rc [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -7,6 +7,13 @@

LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

+IDD_PROPPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
 STRINGTABLE 
 BEGIN
    IDS_CPLSYSTEMNAME "Opcje telefonu i modemu"

Modified: trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ru-RU...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -1,4 +1,11 @@
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+IDD_PROPPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+END

STRINGTABLE 
 BEGIN

Modified: trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/sk-SK...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -1,4 +1,11 @@
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+
+IDD_PROPPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+END

STRINGTABLE 
 BEGIN

Modified: trunk/reactos/dll/cpl/telephon/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/uk-UA...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/lang/uk-UA.rc [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -8,6 +8,13 @@

LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

+IDD_PROPPAGE DIALOGEX 0, 0, 246, 230
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
 STRINGTABLE 
 BEGIN
    IDS_CPLSYSTEMNAME "Òåëåôîí ³ ìîäåì"

Modified: trunk/reactos/dll/cpl/telephon/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/resource.h...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/resource.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/resource.h [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -4,6 +4,8 @@
 /* icons */
 #define IDI_CPLSYSTEM	100

+/* dialogs */
+#define IDD_PROPPAGE 200
 /* strings */
 #define IDS_CPLSYSTEMNAME			1001
 #define IDS_CPLSYSTEMDESCRIPTION	2001

Modified: trunk/reactos/dll/cpl/telephon/telephon.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.c...
==============================================================================
--- trunk/reactos/dll/cpl/telephon/telephon.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/telephon.c [iso-8859-1] Thu Jul  3 11:46:39 2008
@@ -41,6 +41,39 @@
     {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet}
 };

+/* Property page dialog callback */
+INT_PTR CALLBACK
+TelephonPageProc(HWND hwndDlg,
+                UINT uMsg,
+                WPARAM wParam,
+                LPARAM lParam)
+{
+    UNREFERENCED_PARAMETER(lParam);
+    UNREFERENCED_PARAMETER(wParam);
+
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+
+
+static VOID
+InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
+{
+    ZeroMemory(psp, sizeof(PROPSHEETPAGE));
+    psp->dwSize = sizeof(PROPSHEETPAGE);
+    psp->dwFlags = PSP_DEFAULT;
+    psp->hInstance = hApplet;
+    psp->pszTemplate = MAKEINTRESOURCE(idDlg);
+    psp->pfnDlgProc = DlgProc;
+}
+
+
 /* First Applet */
 LONG CALLBACK
 SystemApplet(VOID)
@@ -63,7 +96,7 @@
     psh.ppsp = psp;
     psh.pfnCallback = NULL;

-    //InitPropSheetPage(&psp[0], IDD_PROPPAGE, (DLGPROC)PageProc);
+    InitPropSheetPage(&psp[0], IDD_PROPPAGE, (DLGPROC)TelephonPageProc);

return (LONG)(PropertySheet(&psh) != -1);
 }