- fix build

- set control ids

svn path=/trunk/; revision=29538

diff --git a/reactos/dll/win32/shell32/drive.c b/reactos/dll/win32/shell32/drive.c
index 8c24981..f53c749 100644 (file)
--- a/reactos/dll/win32/shell32/drive.c
+++ b/reactos/dll/win32/shell32/drive.c
@@ -420,7 +420,7 @@ SH_ShowDriveProperties(WCHAR * drive)
 \r
    for (i = 0; i < DRIVE_PROPERTY_PAGES; i++)\r
    {\r
-       HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname, PropPages[i].dlgproc, (LPARAM)drive);\r
+       HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname, PropPages[i].dlgproc, (LPARAM)drive, NULL);\r
        if (hprop)\r
        {\r
           hpsp[psh.nPages] = hprop;\r

diff --git a/reactos/dll/win32/shell32/shell32_De.rc b/reactos/dll/win32/shell32/shell32_De.rc
index 48cb1ac..f536bc1 100644 (file)
--- a/reactos/dll/win32/shell32/shell32_De.rc
+++ b/reactos/dll/win32/shell32/shell32_De.rc
@@ -332,13 +332,13 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 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

diff --git a/reactos/dll/win32/shell32/shell32_En.rc b/reactos/dll/win32/shell32/shell32_En.rc
index b86e8f3..265c29a 100644 (file)
--- a/reactos/dll/win32/shell32/shell32_En.rc
+++ b/reactos/dll/win32/shell32/shell32_En.rc
@@ -332,13 +332,13 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 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

diff --git a/reactos/dll/win32/shell32/shelllink.c b/reactos/dll/win32/shell32/shelllink.c
index 1c06156..fe09a44 100644 (file)
--- a/reactos/dll/win32/shell32/shelllink.c
+++ b/reactos/dll/win32/shell32/shelllink.c
@@ -2716,13 +2716,13 @@ ShellLink_ShowProperties( IShellLinkImpl *This )
 
     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");