[ros-diffs] [weiden] 25522: Move the "Computer Name" page to netid.dll

19 Jan 2007

Author: weiden
Date: Fri Jan 19 03:09:21 2007
New Revision: 25522

URL: http://svn.reactos.org/svn/reactos?rev=25522&view=rev
Log:
Move the "Computer Name" page to netid.dll

Added:
    trunk/reactos/dll/win32/netid/   (with props)
    trunk/reactos/dll/win32/netid/lang/   (with props)
    trunk/reactos/dll/win32/netid/lang/de-DE.rc   (with props)
    trunk/reactos/dll/win32/netid/lang/en-US.rc   (with props)
    trunk/reactos/dll/win32/netid/netid.c
      - copied, changed from r25519, trunk/reactos/dll/cpl/sysdm/computer.c
    trunk/reactos/dll/win32/netid/netid.rbuild   (with props)
    trunk/reactos/dll/win32/netid/netid.rc   (with props)
    trunk/reactos/dll/win32/netid/netid.spec   (with props)
    trunk/reactos/dll/win32/netid/res/   (with props)
    trunk/reactos/dll/win32/netid/res/netid.ico   (with props)
    trunk/reactos/dll/win32/netid/resource.h   (with props)
Removed:
    trunk/reactos/dll/cpl/sysdm/computer.c
Modified:
    trunk/reactos/baseaddress.rbuild
    trunk/reactos/boot/bootdata/packages/reactos.dff
    trunk/reactos/dll/cpl/sysdm/Ja.rc
    trunk/reactos/dll/cpl/sysdm/cz.rc
    trunk/reactos/dll/cpl/sysdm/de.rc
    trunk/reactos/dll/cpl/sysdm/dk.rc
    trunk/reactos/dll/cpl/sysdm/en.rc
    trunk/reactos/dll/cpl/sysdm/es.rc
    trunk/reactos/dll/cpl/sysdm/fr.rc
    trunk/reactos/dll/cpl/sysdm/hu.rc
    trunk/reactos/dll/cpl/sysdm/nl.rc
    trunk/reactos/dll/cpl/sysdm/precomp.h
    trunk/reactos/dll/cpl/sysdm/resource.h
    trunk/reactos/dll/cpl/sysdm/ru.rc
    trunk/reactos/dll/cpl/sysdm/sv.rc
    trunk/reactos/dll/cpl/sysdm/sysdm.c
    trunk/reactos/dll/cpl/sysdm/sysdm.rbuild
    trunk/reactos/dll/cpl/sysdm/sysdm.rc
    trunk/reactos/dll/cpl/sysdm/uk.rc
    trunk/reactos/dll/win32/win32.rbuild

Modified: trunk/reactos/baseaddress.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=255…
==============================================================================

--- trunk/reactos/baseaddress.rbuild (original)
+++ trunk/reactos/baseaddress.rbuild Fri Jan 19 03:09:21 2007
@@ -12,6 +12,7 @@
   <property name="BASEADDRESS_SLAYER" value="0x5c7e0000" />
   <property name="BASEADDRESS_DPLAYX" value="0x5e080000" />
   <property name="BASEADDRESS_DINPUT" value="0x5f580000" />
+  <property name="BASEADDRESS_NETID" value="0x5f660000" />
   <property name="BASEADDRESS_MAPI32" value="0x62250000" />
   <property name="BASEADDRESS_HDWWIZ" value="0x64d40000" />
   <property name="BASEADDRESS_TIMEDATE" value="0x64da0000" />

Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Jan 19 03:09:21 2007
@@ -193,6 +193,7 @@
 dll\win32\mswsock\mswsock.dll                       1
 dll\win32\netapi32\netapi32.dll                     1
 dll\win32\netcfgx\netcfgx.dll                       1
+dll\win32\netid\netid.dll                           1
 dll\win32\newdev\newdev.dll                         1
 dll\win32\ntmarta\ntmarta.dll                       1
 dll\win32\objsel\objsel.dll                         1

Modified: trunk/reactos/dll/cpl/sysdm/Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/Ja.rc?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/Ja.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/Ja.rc Fri Jan 19 03:09:21 2007
@@ -18,23 +18,6 @@
   LTEXT
"",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8
   
   EDITTEXT
IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY
-END
-
-IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "lbg[N ID"
-FONT 9, "MS UI Gothic", 0, 0, 0x0
-BEGIN
-  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1)-5, ICONSIZE, ICONSIZE,
SS_ICON
-  LTEXT "ÌîñðgÁÄlbg[NãÅ±ÌRs[^ð¯ÊµÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  LTEXT "t Rs[^¼:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETPADDING(17),LABELLINE(4)-4
-  LTEXT
"(Default)",IDC_COMPUTERNAME,PROPSHEETPADDING(17),LABELLINE(4)-5,60,LABELLINE(4)-5
-  LTEXT
"[NO[v:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING(1),LABELLINE(6)-6,PROPSHEETPADDING(17),LABELLINE(6)-6
-  LTEXT
"(empty)",IDC_WORKGROUPDOMAIN_NAME,PROPSHEETPADDING(17),LABELLINE(6)-6,60,LABELLINE(6)-6
-  LTEXT "lbg[N¯ÊEBU[hðgÁÄhCÖÌQÁ¨æÑ[J
[U[Ìì¬ðs¤ÉÍA[lbg[N ID]
ðNbNµÄ¾³¢B",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5
-  PUSHBUTTON "lbg[N
ID(&N)...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4
-  LTEXT "Rs[^¼ðÏXµ½èhCÉQÁµ½è·éÉÍ [vpeB]
ðNbNµÄ¾³¢B",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(12)+2
-  PUSHBUTTON
"vpeB(&P)...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

Removed: trunk/reactos/dll/cpl/sysdm/computer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/computer.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/computer.c (original)
+++ trunk/reactos/dll/cpl/sysdm/computer.c (removed)
@@ -1,47 +1,0 @@
-/*
- * PROJECT:     ReactOS System Control Panel Applet
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        dll/cpl/sysdm/computer.c
- * PURPOSE:     Computer settings for networking
- * COPYRIGHT:   Copyright Thomas Weidenmueller &lt;w3seek(a)reactos.org&gt;
- *
- */
-
-#include "precomp.h"
-
-/* Property page dialog callback */
-INT_PTR CALLBACK
-ComputerPageProc(
-  HWND hwndDlg,
-  UINT uMsg,
-  WPARAM wParam,
-  LPARAM lParam
-)
-{
-  LPWKSTA_INFO_101 wki;
-
-  UNREFERENCED_PARAMETER(lParam);
-  UNREFERENCED_PARAMETER(wParam);
-
-  switch(uMsg)
-  {
-    case WM_INITDIALOG:
-    {
-      /* Display computer name */
-      DWORD Size = MAX_COMPUTERNAME_LENGTH + 1;
-      TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1];
-      if (GetComputerName(ComputerName,&Size))
-      {
-         
SendDlgItemMessage(hwndDlg,IDC_COMPUTERNAME,WM_SETTEXT,0,(LPARAM)ComputerName);
-      }
-      if (NetWkstaGetInfo(NULL,101,(LPBYTE*)&wki) == NERR_Success)
-      {
-       
SendDlgItemMessage(hwndDlg,IDC_WORKGROUPDOMAIN_NAME,WM_SETTEXT,0,(LPARAM)wki->wki101_langroup);
-        NetApiBufferFree(&wki);
-      }
-      break;
-    }
-  }
-  return FALSE;
-}
-

Modified: trunk/reactos/dll/cpl/sysdm/cz.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/cz.rc?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/cz.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/cz.rc Fri Jan 19 03:09:21 2007
@@ -18,23 +18,6 @@
   LTEXT
"",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8
   
   EDITTEXT
IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY
-END
-
-IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Síová identifikace"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1)-5, ICONSIZE, ICONSIZE,
SS_ICON
-  LTEXT "ReactOS pouívá následující informace k identifikaci Vaeho poèítaèe v
síti.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  LTEXT "Název
poèítaèe:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETPADDING(17),LABELLINE(4)-4
-  LTEXT
"(Výchozí)",IDC_COMPUTERNAME,PROPSHEETPADDING(17),LABELLINE(4)-5,60,LABELLINE(4)-5
-  LTEXT
"Skupina:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING(1),LABELLINE(6)-6,PROPSHEETPADDING(17),LABELLINE(6)-6
-  LTEXT
"(Prázdné)",IDC_WORKGROUPDOMAIN_NAME,PROPSHEETPADDING(17),LABELLINE(6)-6,60,LABELLINE(6)-6
-  LTEXT "Pro sputìní Prùvodce identifikací v síti, klepnìte na Síová
ID.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5
-  PUSHBUTTON "&Síová
ID...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4
-  LTEXT "Pro pøejmenování poèítaèe nebo nastavení domény, klepnìte na
Vlastnosti.",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(12)+2
-  PUSHBUTTON
"&Vlastnosti",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

Modified: trunk/reactos/dll/cpl/sysdm/de.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/de.rc?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/de.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/de.rc Fri Jan 19 03:09:21 2007
@@ -28,28 +28,6 @@
     CONTROL     "<A
HREF=""http://www.reactos.de/"">ReactOS-Homepage</A>
besuchen", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE |
WS_TABSTOP, 20, 200, 100, 8
     PUSHBUTTON  "&Lizenz anzeigen...", IDC_LICENCE, 170, 199, 78, 13
 END
-
-
-IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Computername"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    ICON        IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON
-    LTEXT       "ReactOS benutzt folgende Informationen, um ihren Computer im
Netzwerk zu identifizieren.", IDC_STATIC, 40, 5, 204, 20
-    LTEXT       "Computer-Beschreibung:", IDC_STATIC, 6, 40, 80, 9
-    EDITTEXT    IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    LTEXT       "Computername:", IDC_STATIC, 6, 68, 64, 9
-    LTEXT       "(Standard)", IDC_COMPUTERNAME, 98, 68, 144, 11
-    LTEXT       "Arbeitsgruppe:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9
-    LTEXT       "(leer)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9
-    LTEXT       "Um den Netzwerk-Identifikations-Assistenten zum Anmelden an einer
Domäne und dem Erstellen eines lokalen Benutzers aufzurufen, klicken Sie auf
""Netzwerk-ID"".", IDC_STATIC, 6, 108, 172, 32
-    PUSHBUTTON  "&Netzwerk-ID...", IDC_NETWORK_ID, 190, 114, 58, 15
-    LTEXT       "Um diesen Computer umzubenennen oder sich an einer Domäne
anzumelden, klicken Sie auf ""Ändern"".", IDC_STATIC, 6, 149,
170, 17
-    PUSHBUTTON  "&Ändern...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT       "Bitte beachten: Nur Administratoren können die Identifikation
dieses Computers ändern.", IDC_STATIC, 6, 179, 250, 18
-END
-
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

Modified: trunk/reactos/dll/cpl/sysdm/dk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/dk.rc?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/dk.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/dk.rc Fri Jan 19 03:09:21 2007
@@ -16,23 +16,6 @@
   LTEXT
"Hukommelse:",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8
   
   EDITTEXT
IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY
-END
-
-IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Netværks Identifikation"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1)-5, ICONSIZE, ICONSIZE,
SS_ICON
-  LTEXT "ReactOS bruger følgende informationer til at identificere din computer på
netværket.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  LTEXT "Dit Fulde Computer
Navn:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(4)-4
-  LTEXT
"",IDC_COMPUTERNAME,120,LABELLINE(4)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(4)-5
-  LTEXT
"Arbejdsgruppe:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING(1),LABELLINE(6)-6,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(6)-6
-  LTEXT
"",IDC_WORKGROUPDOMAIN_NAME,120,LABELLINE(6)-6,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(6)-6
-  LTEXT "For at bruge Netværks Identfications Guiden til at melde in et et domæne
eller oprette en lokal bruger, Klik på Netværks
ID.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5
-  PUSHBUTTON "&Netværks
ID...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4
-  LTEXT "For at omdøbe denne computer eller for at melde ind i et Domæne, Klik på
Egenskaber.",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(12)+2
-  PUSHBUTTON
"&Egenskaber...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

Modified: trunk/reactos/dll/cpl/sysdm/en.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/en.rc?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/en.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/en.rc Fri Jan 19 03:09:21 2007
@@ -18,27 +18,6 @@
     LTEXT       "", IDC_MACHINELINE5, 130, 180, 118, 9
     CONTROL     "Visit the <A
HREF=""http://www.reactos.org/"">ReactOS Homepage</A>",
IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200,
93, 8
     PUSHBUTTON  "View &licence...", IDC_LICENCE, 170, 199, 78, 13
-END
-
-
-IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Computer Name"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    ICON        IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON
-    LTEXT       "ReactOS uses the following information to identify your computer on
the network.", IDC_STATIC, 40, 5, 204, 20
-    LTEXT       "Computer Description:", IDC_STATIC, 6, 40, 70, 9
-    EDITTEXT    IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    LTEXT       "Full computer name:", IDC_STATIC, 6, 68, 64, 9
-    LTEXT       "(Default)", IDC_COMPUTERNAME, 98, 68, 144, 11
-    LTEXT       "Workgroup:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9
-    LTEXT       "(empty)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9
-    LTEXT       "To use the Network Identfication Wizard to join a domain and create
a local user, click ""Network ID"".", IDC_STATIC, 6, 108, 172,
24
-    PUSHBUTTON  "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15
-    LTEXT       "To rename this computer or join a domain, click
""Change"".", IDC_STATIC, 6, 149, 170, 17
-    PUSHBUTTON  "&Change...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT       "Note: Only Administrators can change the identification of this
computer.", IDC_STATIC, 6, 179, 300, 9
 END
 
 

Modified: trunk/reactos/dll/cpl/sysdm/es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/es.rc?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/es.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/es.rc Fri Jan 19 03:09:21 2007
@@ -22,23 +22,6 @@
   LTEXT
"",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8
   
   EDITTEXT
IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY
-END
-
-IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Identificación en el Red"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1)-5, ICONSIZE, ICONSIZE,
SS_ICON
-  LTEXT "ReactOs utiliza la siguiente información para identificar tu computadora en
la
red.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  LTEXT "Nombre Completo del
computador:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETPADDING(17),LABELLINE(4)-4
-  LTEXT
"(predeterminado)",IDC_COMPUTERNAME,PROPSHEETPADDING(17),LABELLINE(4)-5,60,LABELLINE(4)-5
-  LTEXT "Grupo de
Trabajo:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING(1),LABELLINE(6)-6,PROPSHEETPADDING(17),LABELLINE(6)-6
-  LTEXT
"(vacio)",IDC_WORKGROUPDOMAIN_NAME,PROPSHEETPADDING(17),LABELLINE(6)-6,60,LABELLINE(6)-6
-  LTEXT "Para usar el asistente de identificación del red unirse a un dominio o
crear un usuario local, pulse Identificación de
Red.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5
-  PUSHBUTTON "&Network
ID...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4
-  LTEXT "Para renombrar la computadora o unirse a un dominio, pulse
Propiedades.",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(12)+2
-  PUSHBUTTON
"&Propiedades...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

Modified: trunk/reactos/dll/cpl/sysdm/fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/fr.rc?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/fr.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/fr.rc Fri Jan 19 03:09:21 2007
@@ -20,23 +20,6 @@
   LTEXT
"",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8
   
   EDITTEXT
IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY
-END
-
-IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Identification réseau"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1)-5, ICONSIZE, ICONSIZE,
SS_ICON
-  LTEXT "ReactOS utilise les informations suivantes pour identifier votre ordinateur
sur le
réseau.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  LTEXT "Nom complet de
l'ordinateur:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETPADDING(17),LABELLINE(4)-4
-  LTEXT
"(Défaut)",IDC_COMPUTERNAME,PROPSHEETPADDING(17),LABELLINE(4)-5,60,LABELLINE(4)-5
-  LTEXT
"Domaine:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING(1),LABELLINE(6)-6,PROPSHEETPADDING(17),LABELLINE(6)-6
-  LTEXT
"(vide)",IDC_WORKGROUPDOMAIN_NAME,PROPSHEETPADDING(17),LABELLINE(6)-6,60,LABELLINE(6)-6
-  LTEXT "Pour utiliser l'Assistant Réseau, afin de rejoindre un domaine ou créer
un utilisateur local, cliquez sur Identification
Réseau.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(13)-ICONSIZE,LABELLINE(8)+5
-  PUSHBUTTON "&Identification
&réseau...",IDC_NETWORK_ID,170,LABELLINE(7)+5,80,LABELLINE(1)+4
-  LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur
Propriétés.",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(13)-ICONSIZE,LABELLINE(12)+2
-  PUSHBUTTON
"&Propriétés...",IDC_NETWORK_PROPERTY,170,LABELLINE(11)+2,80,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

Modified: trunk/reactos/dll/cpl/sysdm/hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hu.rc?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/hu.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/hu.rc Fri Jan 19 03:09:21 2007
@@ -19,23 +19,6 @@
   LTEXT
"",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8
   
   EDITTEXT
IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY
-END
-
-IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Hálózati azonosítás"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1)-5, ICONSIZE, ICONSIZE,
SS_ICON
-  LTEXT "A ReactOS a következõ információkat fogja használni gépe azonosításához a
hálózaton.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  LTEXT "Teljes számítógép
név:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETPADDING(17),LABELLINE(4)-4
-  LTEXT
"(Alapértelmezett)",IDC_COMPUTERNAME,PROPSHEETPADDING(17),LABELLINE(4)-5,60,LABELLINE(4)-5
-  LTEXT
"Munkacsoport:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING(1),LABELLINE(6)-6,PROPSHEETPADDING(17),LABELLINE(6)-6
-  LTEXT
"(üres)",IDC_WORKGROUPDOMAIN_NAME,PROPSHEETPADDING(17),LABELLINE(6)-6,60,LABELLINE(6)-6
-  LTEXT "Ha a Hálózati azonosítás varázsló használatával akar csatlakozni egy
tartományhoz és kíván létrehozni egy helyi felhasználói fiókot, akkor kattintson a
Hálózati azonosítás
gombra.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5
-  PUSHBUTTON "&Hálózati
azonosítás...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4
-  LTEXT "A számítógépe átnevezéséhez, vagy annak tartományba léptetéséhez kattintson
a Tulajdonságok
gombra.",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(12)+2
-  PUSHBUTTON
"&Tulajdonságok...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

Modified: trunk/reactos/dll/cpl/sysdm/nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/nl.rc?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/nl.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/nl.rc Fri Jan 19 03:09:21 2007
@@ -18,23 +18,6 @@
   LTEXT
"",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8
   
   EDITTEXT
IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY
-END
-
-IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Netwerkidentificatie"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1)-5, ICONSIZE, ICONSIZE,
SS_ICON
-  LTEXT "ReactOS gebruikt de volgende informatie om deze computer in het netwerk te
identificeren.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  LTEXT "Volledige
computernaam:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETPADDING(17),LABELLINE(4)-4
-  LTEXT
"(Default)",IDC_COMPUTERNAME,PROPSHEETPADDING(17),LABELLINE(4)-5,60,LABELLINE(4)-5
-  LTEXT
"Werkgroep:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING(1),LABELLINE(6)-6,PROPSHEETPADDING(17),LABELLINE(6)-6
-  LTEXT
"(empty)",IDC_WORKGROUPDOMAIN_NAME,PROPSHEETPADDING(17),LABELLINE(6)-6,60,LABELLINE(6)-6
-  LTEXT "Klik op Netwerkidentificatie als u de wizard Netwerkidentificatie wilt
starten. Hiermee kunt u de computer lid maken van een domein en kunt u een account voor
een lokale gebruiker
maken",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5
-  PUSHBUTTON
"&Netwerkidentificatie",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4
-  LTEXT "Klik op Eigenschappen als u de naam van deze computer wilt wijzigen of de
computer lid wilt maken van een
domein.",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(12)+2
-  PUSHBUTTON
"&Eigenschappen",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

Modified: trunk/reactos/dll/cpl/sysdm/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/precomp.h?re…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/precomp.h (original)
+++ trunk/reactos/dll/cpl/sysdm/precomp.h Fri Jan 19 03:09:21 2007
@@ -5,7 +5,6 @@
 #include <commctrl.h>
 #include <tchar.h>
 #include <stdio.h>
-#include <lm.h>
 #include <cpl.h>
 #include <shellapi.h>
 #include <shlwapi.h>
@@ -33,7 +32,6 @@
 
 /* prop sheet pages */
 INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-INT_PTR CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam);
 INT_PTR CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam);
 INT_PTR CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam);
 

Modified: trunk/reactos/dll/cpl/sysdm/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/resource.h (original)
+++ trunk/reactos/dll/cpl/sysdm/resource.h Fri Jan 19 03:09:21 2007
@@ -5,9 +5,8 @@
 
 #define IDI_CPLSYSTEM                   50
 #define IDI_DEVMGR                      51
-#define IDI_COMPNAME                    52
-#define IDI_HARDPROF                    53
-#define IDI_USERPROF                    54
+#define IDI_HARDPROF                    52
+#define IDI_USERPROF                    53
 
 #define IDB_ROSBMP                      55
 
@@ -30,16 +29,6 @@
 #define IDC_LICENCE                     106
 #define IDC_ROSIMG                      107
 #define IDC_ROSHOMEPAGE_LINK            108
-
-
-/* propsheet - computer name */
-#define IDD_PROPPAGECOMPUTER            200
-#define IDC_COMPDESC                    201
-#define IDC_COMPUTERNAME                202
-#define IDC_WORKGROUPDOMAIN_NAME        203
-#define IDC_WORKGROUPDOMAIN	            204
-#define IDC_NETWORK_ID                  205
-#define IDC_NETWORK_PROPERTY            206
 
 
 /* propsheet - hardware */

Modified: trunk/reactos/dll/cpl/sysdm/ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/ru.rc?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/ru.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/ru.rc Fri Jan 19 03:09:21 2007
@@ -18,23 +18,6 @@
   LTEXT
"",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8
   
   EDITTEXT
IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY
-END
-
-IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Ñåòåâàÿ èíäåíòèôèêàöèÿ"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1)-5, ICONSIZE, ICONSIZE,
SS_ICON
-  LTEXT "ReactOS èñïîëüçóåò ñëåäóþùóþ èíôîðìàöèþ, ÷òîáû èíäåíòèôèöèðîâàòü âàø
êîìïüþòåð â
ñåòè.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  LTEXT "Ïîëíîå èìÿ
êîìïüþòåðà:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETPADDING(17),LABELLINE(4)-4
-  LTEXT "(ïî
óìîë÷àíèþ)",IDC_COMPUTERNAME,PROPSHEETPADDING(17),LABELLINE(4)-5,60,LABELLINE(4)-5
-  LTEXT "Ðàáî÷àÿ
ãðàïïà:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING(1),LABELLINE(6)-6,PROPSHEETPADDING(17),LABELLINE(6)-6
-  LTEXT
"(ïóñòî)",IDC_WORKGROUPDOMAIN_NAME,PROPSHEETPADDING(17),LABELLINE(6)-6,60,LABELLINE(6)-6
-  LTEXT "Èñïîëüçóéòå Ìàñòåð ñåòåâîé èíäåíòèôèêàöèè, ÷òîáû ïðèñîåäèíèòüñÿ ê äîìåíó è
ñîçäàòü ëîêàëüíîãî ïîëüçîâàòåëÿ, íàæìèòå êíîïêó
Èíäåíòèôèêàöèÿ.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5
-  PUSHBUTTON
"&Èíäåíòèôèêàöèÿ...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4
-  LTEXT "×òîáû ïåðåèìåíîâàòü êîìïüþòåð èëè ïðèñîåäèíèòüñÿ ê äîìåíó, íàæìèòå êíîïêó
Ñâîéñòâà",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(12)+2
-  PUSHBUTTON
"&Ñâîéñòâà...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

Modified: trunk/reactos/dll/cpl/sysdm/sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sv.rc?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/sv.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/sv.rc Fri Jan 19 03:09:21 2007
@@ -20,23 +20,6 @@
   LTEXT
"",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8
   
   EDITTEXT
IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY
-END
-
-IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Nätverksidentitet"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1)-5, ICONSIZE, ICONSIZE,
SS_ICON
-  LTEXT "ReactOS använder följande information för att identifiera din dator på
nätverket.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  LTEXT "Fullständigt
datornamn:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(4)-4
-  LTEXT
"",IDC_COMPUTERNAME,120,LABELLINE(4)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(4)-5
-  LTEXT
"Arbetsgrupp:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING(1),LABELLINE(6)-6,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(6)-6
-  LTEXT
"",IDC_WORKGROUPDOMAIN_NAME,120,LABELLINE(6)-6,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(6)-6
-  LTEXT "Klicka på Nätverksidentitet för att använda guiden Nätverksidentifikation
för att ansluta till en domän och skapa en lokal
användare.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5
-  PUSHBUTTON
"&Nätverksidentitet...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4
-  LTEXT "Klicka på egenskaper för att ansluta till en domän eller ändra
datornamnet.",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(12)+2
-  PUSHBUTTON
"&Egenskaper...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.c?rev=…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/sysdm.c (original)
+++ trunk/reactos/dll/cpl/sysdm/sysdm.c Fri Jan 19 03:09:21 2007
@@ -18,7 +18,7 @@
   {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet}
 };
 
-#define MAX_SYSTEM_PAGES    8
+#define MAX_SYSTEM_PAGES    32
 
 static BOOL CALLBACK
 PropSheetAddPage(HPROPSHEETPAGE hpage, LPARAM lParam)
@@ -58,20 +58,55 @@
     return FALSE;
 }
 
+typedef HPROPSHEETPAGE (WINAPI *PCreateNetIDPropertyPage)(VOID);
+
+static HMODULE
+AddNetIdPage(PROPSHEETHEADER *ppsh)
+{
+    HPROPSHEETPAGE hPage;
+    HMODULE hMod;
+    PCreateNetIDPropertyPage pCreateNetIdPage;
+
+    hMod = LoadLibrary(TEXT("netid.dll"));
+    if (hMod != NULL)
+    {
+        pCreateNetIdPage = (PCreateNetIDPropertyPage)GetProcAddress(hMod,
+                                                                   
"CreateNetIDPropertyPage");
+        if (pCreateNetIdPage != NULL)
+        {
+            hPage = pCreateNetIdPage();
+            if (hPage == NULL)
+                goto Fail;
+
+            if (!PropSheetAddPage(hPage, (LPARAM)ppsh))
+            {
+                DestroyPropertySheetPage(hPage);
+                goto Fail;
+            }
+        }
+        else
+        {
+Fail:
+            FreeLibrary(hMod);
+            hMod = NULL;
+        }
+    }
+
+    return hMod;
+}
+
 /* First Applet */
-
 LONG CALLBACK
 SystemApplet(VOID)
 {
   HPROPSHEETPAGE hpsp[MAX_SYSTEM_PAGES];
   PROPSHEETHEADER psh;
-  TCHAR Caption[128];
-  static INITCOMMONCONTROLSEX icc = {sizeof(INITCOMMONCONTROLSEX), ICC_LINK_CLASS};
+  HMODULE hNetIdDll;
+  LONG Ret;
+  static const INITCOMMONCONTROLSEX icc = {sizeof(INITCOMMONCONTROLSEX),
ICC_LINK_CLASS};
 
   if (!InitCommonControlsEx(&icc))
       return 0;
-
-  LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR));
 
   ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
   psh.dwSize = sizeof(PROPSHEETHEADER);
@@ -79,18 +114,23 @@
   psh.hwndParent = NULL;
   psh.hInstance = hApplet;
   psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
-  psh.pszCaption = Caption;
+  psh.pszCaption = MAKEINTRESOURCE(IDS_CPLSYSTEMNAME);
   psh.nPages = 0;
   psh.nStartPage = 0;
   psh.phpage = hpsp;
   psh.pfnCallback = NULL;
 
   InitPropSheetPage(&psh, IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc);
-  InitPropSheetPage(&psh, IDD_PROPPAGECOMPUTER, (DLGPROC) ComputerPageProc);
+  hNetIdDll = AddNetIdPage(&psh);
   InitPropSheetPage(&psh, IDD_PROPPAGEHARDWARE, (DLGPROC) HardwarePageProc);
   InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc);
 
-  return (LONG)(PropertySheet(&psh) != -1);
+  Ret = (LONG)(PropertySheet(&psh) != -1);
+
+  if (hNetIdDll != NULL)
+      FreeLibrary(hNetIdDll);
+
+  return Ret;
 }
 
 /* Control Panel Callback */

Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/sysdm.rbuild (original)
+++ trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Fri Jan 19 03:09:21 2007
@@ -12,14 +12,12 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
-	<library>netapi32</library>
 	<library>ntdll</library>
 	<library>msimg32</library>
 	<library>shell32</library>
 	<library>shlwapi</library>
 	<library>ole32</library>
 	<file>advanced.c</file>
-	<file>computer.c</file>
 	<file>environment.c</file>
 	<file>general.c</file>
 	<file>hardprof.c</file>

Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/sysdm.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/sysdm.rc Fri Jan 19 03:09:21 2007
@@ -15,7 +15,6 @@
 IDI_CPLSYSTEM   ICON "resources/applet.ico"
 
 IDI_USERPROF    ICON "resources/devmgr.ico"
-IDI_COMPNAME    ICON "resources/devmgr.ico"
 IDI_HARDPROF    ICON "resources/devmgr.ico"
 IDI_DEVMGR      ICON "resources/devmgr.ico"
 

Modified: trunk/reactos/dll/cpl/sysdm/uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/uk.rc?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/uk.rc (original)
+++ trunk/reactos/dll/cpl/sysdm/uk.rc Fri Jan 19 03:09:21 2007
@@ -26,23 +26,6 @@
   LTEXT
"",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8
   
   EDITTEXT
IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY
-END
-
-IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Ìåðåæåâà ³íäåíò³ô³êàöèÿ"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1)-5, ICONSIZE, ICONSIZE,
SS_ICON
-  LTEXT "ReactOS âèêîðèñòîâóº íàñòóïíó ³íôîðìàö³þ, ùîá ³äåíòèô³êóâàòè âàø
êîìï'þòåð â
ìåðåæ³.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  LTEXT "Ïîâíå ³ì'ÿ
êîìï'þòåðà:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETPADDING(17),LABELLINE(4)-4
-  LTEXT "(Çà
çàìîâ÷óâàííÿì)",IDC_COMPUTERNAME,PROPSHEETPADDING(17),LABELLINE(4)-5,60,LABELLINE(4)-5
-  LTEXT "Ðîáî÷à
ãðóïà:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING(1),LABELLINE(6)-6,PROPSHEETPADDING(17),LABELLINE(6)-6
-  LTEXT
"(ïîðîæíüî)",IDC_WORKGROUPDOMAIN_NAME,PROPSHEETPADDING(17),LABELLINE(6)-6,60,LABELLINE(6)-6
-  LTEXT "Ùîá ñêîðèñòóâàòèñÿ Ìàéñòðîì ìåðåæåâî¿ ³äåíòèô³êàö³¿ äëÿ ïðèºäíàííÿ äî
äîìåíó ³ ñòâîðåííÿ ëîêàëüíîãî êîðèñòóâà÷à, íàòèñí³òü
²äåíòèô³êàö³ÿ.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5
-  PUSHBUTTON
"&²äåíòèô³êàö³ÿ...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4
-  LTEXT "Ùîá ïåðåéìåíóâàòè öåé êîìï'þòåð àáî ïðèºäíàòèñÿ äî äîìåíó, íàòèñí³òü
Âëàñòèâîñò³.",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(12)+2
-  PUSHBUTTON
"&Âëàñòèâîñò³...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

Propchange: trunk/reactos/dll/win32/netid/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 19 03:09:21 2007
@@ -1,0 +1,4 @@
+GNUmakefile
+*.bak
+*.vcproj
+*.user

Propchange: trunk/reactos/dll/win32/netid/lang/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 19 03:09:21 2007
@@ -1,0 +1,4 @@
+GNUmakefile
+*.bak
+*.vcproj
+*.user

Added: trunk/reactos/dll/win32/netid/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/de-DE…
==============================================================================
--- trunk/reactos/dll/win32/netid/lang/de-DE.rc (added)
+++ trunk/reactos/dll/win32/netid/lang/de-DE.rc Fri Jan 19 03:09:21 2007
@@ -1,0 +1,30 @@
+/*
+ * PROJECT:         ReactOS System Configuration Applet
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * PURPOSE:         German language file for net.dll
+ * PROGRAMMERS:     Eric Kohl
+ * TRANSLATOR:      Colin Finck &lt;mail(a)colinfinck.de&gt;
+ */
+
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+
+IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Computername"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    ICON        IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON
+    LTEXT       "ReactOS benutzt folgende Informationen, um ihren Computer im
Netzwerk zu identifizieren.", IDC_STATIC, 40, 5, 204, 20
+    LTEXT       "Computer-Beschreibung:", IDC_STATIC, 6, 40, 80, 9
+    EDITTEXT    IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT       "Computername:", IDC_STATIC, 6, 68, 64, 9
+    LTEXT       "(Standard)", IDC_COMPUTERNAME, 98, 68, 144, 11
+    LTEXT       "Arbeitsgruppe:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9
+    LTEXT       "(leer)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9
+    LTEXT       "Um den Netzwerk-Identifikations-Assistenten zum Anmelden an einer
Domäne und dem Erstellen eines lokalen Benutzers aufzurufen, klicken Sie auf
""Netzwerk-ID"".", IDC_STATIC, 6, 108, 172, 32
+    PUSHBUTTON  "&Netzwerk-ID...", IDC_NETWORK_ID, 190, 114, 58, 15
+    LTEXT       "Um diesen Computer umzubenennen oder sich an einer Domäne
anzumelden, klicken Sie auf ""Ändern"".", IDC_STATIC, 6, 149,
170, 17
+    PUSHBUTTON  "&Ändern...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15
+    LTEXT       "Bitte beachten: Nur Administratoren können die Identifikation
dieses Computers ändern.", IDC_STATIC, 6, 179, 250, 18
+END
+

Propchange: trunk/reactos/dll/win32/netid/lang/de-DE.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/netid/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/en-US…
==============================================================================
--- trunk/reactos/dll/win32/netid/lang/en-US.rc (added)
+++ trunk/reactos/dll/win32/netid/lang/en-US.rc Fri Jan 19 03:09:21 2007
@@ -1,0 +1,22 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Computer Name"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    ICON        IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON
+    LTEXT       "ReactOS uses the following information to identify your computer on
the network.", IDC_STATIC, 40, 5, 204, 20
+    LTEXT       "Computer Description:", IDC_STATIC, 6, 40, 70, 9
+    EDITTEXT    IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT       "Full computer name:", IDC_STATIC, 6, 68, 64, 9
+    LTEXT       "(Default)", IDC_COMPUTERNAME, 98, 68, 144, 11
+    LTEXT       "Workgroup:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9
+    LTEXT       "(empty)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9
+    LTEXT       "To use the Network Identfication Wizard to join a domain and create
a local user, click ""Network ID"".", IDC_STATIC, 6, 108, 172,
24
+    PUSHBUTTON  "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15
+    LTEXT       "To rename this computer or join a domain, click
""Change"".", IDC_STATIC, 6, 149, 170, 17
+    PUSHBUTTON  "&Change...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15
+    LTEXT       "Note: Only Administrators can change the identification of this
computer.", IDC_STATIC, 6, 179, 300, 9
+END
+

Propchange: trunk/reactos/dll/win32/netid/lang/en-US.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: trunk/reactos/dll/win32/netid/netid.c (from r25519,
trunk/reactos/dll/cpl/sysdm/computer.c)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.c?p2…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/computer.c (original)
+++ trunk/reactos/dll/win32/netid/netid.c Fri Jan 19 03:09:21 2007
@@ -1,47 +1,88 @@
 /*
  * PROJECT:     ReactOS System Control Panel Applet
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        dll/cpl/sysdm/computer.c
- * PURPOSE:     Computer settings for networking
+ * FILE:        dll/win32/netid/netid.c
+ * PURPOSE:     Network ID Page
  * COPYRIGHT:   Copyright Thomas Weidenmueller &lt;w3seek(a)reactos.org&gt;
  *
  */
 
-#include "precomp.h"
+#include <windows.h>
+#include <lm.h>
+#include <prsht.h>
+#include "resource.h"
 
-/* Property page dialog callback */
-INT_PTR CALLBACK
-ComputerPageProc(
-  HWND hwndDlg,
-  UINT uMsg,
-  WPARAM wParam,
-  LPARAM lParam
-)
+static HINSTANCE hDllInstance;
+
+static INT_PTR CALLBACK
+NetIDPageProc(IN HWND hwndDlg,
+              IN UINT uMsg,
+              IN WPARAM wParam,
+              IN LPARAM lParam)
 {
-  LPWKSTA_INFO_101 wki;
+    LPWKSTA_INFO_101 wki;
+    INT_PTR Ret = 0;
 
-  UNREFERENCED_PARAMETER(lParam);
-  UNREFERENCED_PARAMETER(wParam);
+    UNREFERENCED_PARAMETER(lParam);
+    UNREFERENCED_PARAMETER(wParam);
 
-  switch(uMsg)
-  {
-    case WM_INITDIALOG:
+    switch (uMsg)
     {
-      /* Display computer name */
-      DWORD Size = MAX_COMPUTERNAME_LENGTH + 1;
-      TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1];
-      if (GetComputerName(ComputerName,&Size))
-      {
-         
SendDlgItemMessage(hwndDlg,IDC_COMPUTERNAME,WM_SETTEXT,0,(LPARAM)ComputerName);
-      }
-      if (NetWkstaGetInfo(NULL,101,(LPBYTE*)&wki) == NERR_Success)
-      {
-       
SendDlgItemMessage(hwndDlg,IDC_WORKGROUPDOMAIN_NAME,WM_SETTEXT,0,(LPARAM)wki->wki101_langroup);
-        NetApiBufferFree(&wki);
-      }
-      break;
+        case WM_INITDIALOG:
+        {
+            /* Display computer name */
+            DWORD Size = MAX_COMPUTERNAME_LENGTH + 1;
+            TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1];
+            if (GetComputerName(ComputerName,&Size))
+            {
+                SetDlgItemText(hwndDlg,
+                               IDC_COMPUTERNAME,
+                               ComputerName);
+            }
+            if (NetWkstaGetInfo(NULL,
+                                101,
+                                (LPBYTE*)&wki) == NERR_Success)
+            {
+                SetDlgItemText(hwndDlg,
+                               IDC_WORKGROUPDOMAIN_NAME,
+                               wki->wki101_langroup);
+                NetApiBufferFree(&wki);
+            }
+
+            Ret = TRUE;
+            break;
+        }
     }
-  }
-  return FALSE;
+
+    return Ret;
 }
 
+HPROPSHEETPAGE WINAPI
+CreateNetIDPropertyPage(VOID)
+{
+    PROPSHEETPAGE psp = {0};
+
+    psp.dwSize = sizeof(psp);
+    psp.dwFlags = PSP_DEFAULT;
+    psp.hInstance= hDllInstance;
+    psp.pszTemplate = MAKEINTRESOURCE(IDD_PROPPAGECOMPUTER);
+    psp.pfnDlgProc = NetIDPageProc;
+
+    return CreatePropertySheetPage(&psp);
+}
+
+BOOL WINAPI
+DllMain(IN HINSTANCE hinstDLL,
+        IN DWORD dwReason,
+        IN LPVOID lpvReserved)
+{
+    switch (dwReason)
+    {
+        case DLL_PROCESS_ATTACH:
+            hDllInstance = hinstDLL;
+            DisableThreadLibraryCalls(hinstDLL);
+            break;
+    }
+
+    return TRUE;
+}

Added: trunk/reactos/dll/win32/netid/netid.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rbui…
==============================================================================
--- trunk/reactos/dll/win32/netid/netid.rbuild (added)
+++ trunk/reactos/dll/win32/netid/netid.rbuild Fri Jan 19 03:09:21 2007
@@ -1,0 +1,18 @@
+<module name="netid" type="win32dll"
baseaddress="${BASEADDRESS_NETID}" installbase="system32"
installname="netid.dll" unicode="true">
+	<importlibrary definition="netid.spec.def" />
+	<include base="netid">.</include>
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x0500</define>
+	<define name="_WIN32_WINNT">0x0600</define>
+	<define name="WINVER">0x0600</define>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>comctl32</library>
+	<library>advapi32</library>
+	<library>netapi32</library>
+	<file>netid.c</file>
+	<file>netid.rc</file>
+	<file>netid.spec</file>
+</module>

Propchange: trunk/reactos/dll/win32/netid/netid.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/netid/netid.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rc?r…
==============================================================================
--- trunk/reactos/dll/win32/netid/netid.rc (added)
+++ trunk/reactos/dll/win32/netid/netid.rc Fri Jan 19 03:09:21 2007
@@ -1,0 +1,14 @@
+#include <windows.h>
+#include <reactos/resource.h>
+#include "resource.h"
+
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Network ID Page\0"
+#define REACTOS_STR_INTERNAL_NAME	"netid\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"netid.dll\0"
+#include <reactos/version.rc>
+
+IDI_COMPNAME    ICON "res/netid.ico"
+
+#include "lang/en-US.rc"
+#include "lang/de-DE.rc"

Propchange: trunk/reactos/dll/win32/netid/netid.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/netid/netid.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.spec…
==============================================================================
--- trunk/reactos/dll/win32/netid/netid.spec (added)
+++ trunk/reactos/dll/win32/netid/netid.spec Fri Jan 19 03:09:21 2007
@@ -1,0 +1,4 @@
+# netid.dll exports
+
+ 1 stdcall CreateNetIDPropertyPage()
+# 2 stdcall ShowDcNotFoundErrorDialog(???)

Propchange: trunk/reactos/dll/win32/netid/netid.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/dll/win32/netid/res/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 19 03:09:21 2007
@@ -1,0 +1,4 @@
+GNUmakefile
+*.bak
+*.vcproj
+*.user

Added: trunk/reactos/dll/win32/netid/res/netid.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/res/netid.…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/win32/netid/res/netid.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/reactos/dll/win32/netid/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/resource.h…
==============================================================================
--- trunk/reactos/dll/win32/netid/resource.h (added)
+++ trunk/reactos/dll/win32/netid/resource.h Fri Jan 19 03:09:21 2007
@@ -1,0 +1,19 @@
+#ifndef __NETID_RESOURCE_H
+#define __NETID_RESOURCE_H
+
+#ifndef IDC_STATIC
+#define IDC_STATIC  -1
+#endif
+
+#define IDI_COMPNAME                    50
+
+#define IDD_PROPPAGECOMPUTER            200
+
+#define IDC_COMPDESC                    201
+#define IDC_COMPUTERNAME                202
+#define IDC_WORKGROUPDOMAIN_NAME        203
+#define IDC_WORKGROUPDOMAIN	            204
+#define IDC_NETWORK_ID                  205
+#define IDC_NETWORK_PROPERTY            206
+
+#endif /* __NETID_RESOURCE_H */

Propchange: trunk/reactos/dll/win32/netid/resource.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/win32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev…
==============================================================================
--- trunk/reactos/dll/win32/win32.rbuild (original)
+++ trunk/reactos/dll/win32/win32.rbuild Fri Jan 19 03:09:21 2007
@@ -136,6 +136,9 @@
 <directory name="netcfgx">
 	<xi:include href="netcfgx/netcfgx.rbuild" />
 </directory>
+<directory name="netid">
+	<xi:include href="netid/netid.rbuild" />
+</directory>
 <directory name="newdev">
 	<xi:include href="newdev/newdev.rbuild" />
 </directory>



    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

[ros-diffs] [weiden] 25522: Move the "Computer Name" page to netid.dll