[ros-diffs] [janderwald] 29538: - fix build - set control ids

Author: janderwald
Date: Fri Oct 12 18:49:21 2007
New Revision: 29538

URL: http://svn.reactos.org/svn/reactos?rev=29538&view=rev
Log:
- fix build
- set control ids

Modified:
    trunk/reactos/dll/win32/shell32/drive.c
    trunk/reactos/dll/win32/shell32/shell32_De.rc
    trunk/reactos/dll/win32/shell32/shell32_En.rc
    trunk/reactos/dll/win32/shell32/shelllink.c

Modified: trunk/reactos/dll/win32/shell32/drive.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?…
==============================================================================
--- trunk/reactos/dll/win32/shell32/drive.c (original)
+++ trunk/reactos/dll/win32/shell32/drive.c Fri Oct 12 18:49:21 2007
@@ -420,7 +420,7 @@
 
    for (i = 0; i < DRIVE_PROPERTY_PAGES; i++)
    {
-       HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname,
PropPages[i].dlgproc, (LPARAM)drive);
+       HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname,
PropPages[i].dlgproc, (LPARAM)drive, NULL);
        if (hprop)
        {
           hpsp[psh.nPages] = hprop;

Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_De.rc (original)
+++ trunk/reactos/dll/win32/shell32/shell32_De.rc Fri Oct 12 18:49:21 2007
@@ -332,13 +332,13 @@
 CAPTION "Recycle Bin Properties"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 {
-  CONTROL "", -1, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS |
WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
+  CONTROL "", 14000, "SysListView32", LVS_REPORT |
LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
   GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70
-  RADIOBUTTON "&Custom size:", -1, 20, 90, 80, 10
-  EDITTEXT -1, 90, 90, 50, 10, WS_TABSTOP
+  RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10
+  EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP
   LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10
-  RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately
when deleted.", -1, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP
-  RADIOBUTTON"&Display delete confirmation dialog", -1, 20, 155, 140, 10,
WS_TABSTOP
+  RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately
when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP
+  RADIOBUTTON"&Display delete confirmation dialog", 14004, 20, 155, 140,
10, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE

Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_En.rc (original)
+++ trunk/reactos/dll/win32/shell32/shell32_En.rc Fri Oct 12 18:49:21 2007
@@ -332,13 +332,13 @@
 CAPTION "Recycle Bin Properties"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 {
-  CONTROL "", -1, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS |
WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
+  CONTROL "", 14000, "SysListView32", LVS_REPORT |
LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
   GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70
-  RADIOBUTTON "&Custom size:", -1, 20, 90, 80, 10
-  EDITTEXT -1, 90, 90, 50, 10, WS_TABSTOP
+  RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10
+  EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP
   LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10
-  RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately
when deleted.", -1, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP
-  RADIOBUTTON"&Display delete confirmation dialog", -1, 20, 155, 140, 10,
WS_TABSTOP
+  RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately
when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP
+  RADIOBUTTON"&Display delete confirmation dialog", 14004, 20, 155, 140,
10, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE

Modified: trunk/reactos/dll/win32/shell32/shelllink.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shelllink.c (original)
+++ trunk/reactos/dll/win32/shell32/shelllink.c Fri Oct 12 18:49:21 2007
@@ -2716,13 +2716,13 @@
 
     memset(hppages, 0x0, sizeof(HPROPSHEETPAGE) * MAX_PROPERTY_SHEET_PAGE);
 
-    hpage = SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG",
SH_FileGeneralDlgProc, (LPARAM)This->sLinkPath);
+    hpage = SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG",
SH_FileGeneralDlgProc, (LPARAM)This->sLinkPath, NULL);
     if ( hpage == NULL )
         return E_FAIL;
     else
         hppages[numpages++] = hpage;
 
-	hpage = SH_CreatePropertySheetPage("SHELL_GENERAL_SHORTCUT_DLG",
SH_ShellLinkDlgProc, (LPARAM)This);
+	hpage = SH_CreatePropertySheetPage("SHELL_GENERAL_SHORTCUT_DLG",
SH_ShellLinkDlgProc, (LPARAM)This, NULL);
 	if ( hpage == NULL )
     {
         ERR("SH_CreatePropertySheetPage failed\n");