From 0c3e4dc99bfeedf5bd2d93d5345a85ce673c4d24 Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Fri, 19 Jan 2007 00:09:21 +0000 Subject: [PATCH] Move the "Computer Name" page to netid.dll svn path=/trunk/; revision=25522 --- reactos/baseaddress.rbuild | 1 + reactos/boot/bootdata/packages/reactos.dff | 1 + reactos/dll/cpl/sysdm/Ja.rc | 17 ---- reactos/dll/cpl/sysdm/computer.c | 47 ----------- reactos/dll/cpl/sysdm/cz.rc | 17 ---- reactos/dll/cpl/sysdm/de.rc | 22 ------ reactos/dll/cpl/sysdm/dk.rc | 17 ---- reactos/dll/cpl/sysdm/en.rc | 21 ----- reactos/dll/cpl/sysdm/es.rc | 17 ---- reactos/dll/cpl/sysdm/fr.rc | 17 ---- reactos/dll/cpl/sysdm/hu.rc | 17 ---- reactos/dll/cpl/sysdm/nl.rc | 17 ---- reactos/dll/cpl/sysdm/precomp.h | 2 - reactos/dll/cpl/sysdm/resource.h | 15 +--- reactos/dll/cpl/sysdm/ru.rc | 17 ---- reactos/dll/cpl/sysdm/sv.rc | 17 ---- reactos/dll/cpl/sysdm/sysdm.c | 58 +++++++++++--- reactos/dll/cpl/sysdm/sysdm.rbuild | 2 - reactos/dll/cpl/sysdm/sysdm.rc | 1 - reactos/dll/cpl/sysdm/uk.rc | 17 ---- reactos/dll/win32/netid/lang/de-DE.rc | 30 +++++++ reactos/dll/win32/netid/lang/en-US.rc | 22 ++++++ reactos/dll/win32/netid/netid.c | 88 +++++++++++++++++++++ reactos/dll/win32/netid/netid.rbuild | 18 +++++ reactos/dll/win32/netid/netid.rc | 14 ++++ reactos/dll/win32/netid/netid.spec | 4 + reactos/dll/win32/netid/res/netid.ico | Bin 0 -> 29926 bytes reactos/dll/win32/netid/resource.h | 19 +++++ reactos/dll/win32/win32.rbuild | 3 + 29 files changed, 251 insertions(+), 287 deletions(-) delete mode 100644 reactos/dll/cpl/sysdm/computer.c create mode 100644 reactos/dll/win32/netid/lang/de-DE.rc create mode 100644 reactos/dll/win32/netid/lang/en-US.rc create mode 100644 reactos/dll/win32/netid/netid.c create mode 100644 reactos/dll/win32/netid/netid.rbuild create mode 100644 reactos/dll/win32/netid/netid.rc create mode 100644 reactos/dll/win32/netid/netid.spec create mode 100644 reactos/dll/win32/netid/res/netid.ico create mode 100644 reactos/dll/win32/netid/resource.h diff --git a/reactos/baseaddress.rbuild b/reactos/baseaddress.rbuild index 8cb1ba9f109..a615bde0f12 100644 --- a/reactos/baseaddress.rbuild +++ b/reactos/baseaddress.rbuild @@ -12,6 +12,7 @@ + diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff index 9b9c367132b..9eff463e081 100644 --- a/reactos/boot/bootdata/packages/reactos.dff +++ b/reactos/boot/bootdata/packages/reactos.dff @@ -193,6 +193,7 @@ dll\win32\msvideo\msvfw32.dll 1 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 diff --git a/reactos/dll/cpl/sysdm/Ja.rc b/reactos/dll/cpl/sysdm/Ja.rc index 060a83c1d8c..2b903a4c0ee 100644 --- a/reactos/dll/cpl/sysdm/Ja.rc +++ b/reactos/dll/cpl/sysdm/Ja.rc @@ -20,23 +20,6 @@ BEGIN 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 "ネットワーク 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 "次の情報を使ってネットワーク上でこのコンピュータを識別します。",-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 "(Default)",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 "(empty)",IDC_WORKGROUPDOMAIN_NAME,PROPSHEETPADDING(17),LABELLINE(6)-6,60,LABELLINE(6)-6 - LTEXT "ネットワーク識別ウィザードを使ってドメインへの参加およびローカル ユーザーの作成を行うには、[ネットワーク ID] をクリックしてください。",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5 - PUSHBUTTON "ネットワーク ID(&N)...",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 "プロパティ(&P)...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4 -END - IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ハードウェア" diff --git a/reactos/dll/cpl/sysdm/computer.c b/reactos/dll/cpl/sysdm/computer.c deleted file mode 100644 index 3ddbebc8d3f..00000000000 --- a/reactos/dll/cpl/sysdm/computer.c +++ /dev/null @@ -1,47 +0,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 - * - */ - -#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; -} - diff --git a/reactos/dll/cpl/sysdm/cz.rc b/reactos/dll/cpl/sysdm/cz.rc index de650d13a17..16e7ebd80c4 100644 --- a/reactos/dll/cpl/sysdm/cz.rc +++ b/reactos/dll/cpl/sysdm/cz.rc @@ -20,23 +20,6 @@ BEGIN 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捐v 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疽ledujc informace k identifikaci Va啼ho po竟ta鐺 v sti.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - LTEXT "N痙ev po竟ta鐺:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETPADDING(17),LABELLINE(4)-4 - LTEXT "(Vchoz)",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痙dn)",IDC_WORKGROUPDOMAIN_NAME,PROPSHEETPADDING(17),LABELLINE(6)-6,60,LABELLINE(6)-6 - LTEXT "Pro spu嗾n Prvodce identifikac v sti, klepnte na S捐v ID.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5 - PUSHBUTTON "&S捐v ID...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 - LTEXT "Pro pejmenov疣 po竟ta鐺 nebo nastaven dom駭y, klepnte 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 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" diff --git a/reactos/dll/cpl/sysdm/de.rc b/reactos/dll/cpl/sysdm/de.rc index bb325782d3d..23460590147 100644 --- a/reactos/dll/cpl/sysdm/de.rc +++ b/reactos/dll/cpl/sysdm/de.rc @@ -29,28 +29,6 @@ BEGIN 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舅e 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舅e 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 knnen die Identifikation dieses Computers 舅dern.", 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 CAPTION "Hardware" diff --git a/reactos/dll/cpl/sysdm/dk.rc b/reactos/dll/cpl/sysdm/dk.rc index 31cbd566fbe..072bc864205 100644 --- a/reactos/dll/cpl/sysdm/dk.rc +++ b/reactos/dll/cpl/sysdm/dk.rc @@ -18,23 +18,6 @@ BEGIN 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誡ks 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 flgende informationer til at identificere din computer p netv誡ket.",-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誡ks Identfications Guiden til at melde in et et dom誅e eller oprette en lokal bruger, Klik p Netv誡ks ID.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5 - PUSHBUTTON "&Netv誡ks ID...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 - LTEXT "For at omdbe denne computer eller for at melde ind i et Dom誅e, 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 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" diff --git a/reactos/dll/cpl/sysdm/en.rc b/reactos/dll/cpl/sysdm/en.rc index 3b9eb8e302c..41630e12f69 100644 --- a/reactos/dll/cpl/sysdm/en.rc +++ b/reactos/dll/cpl/sysdm/en.rc @@ -21,27 +21,6 @@ BEGIN 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 - - IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" diff --git a/reactos/dll/cpl/sysdm/es.rc b/reactos/dll/cpl/sysdm/es.rc index 9da46193e60..11715b7c1f6 100644 --- a/reactos/dll/cpl/sysdm/es.rc +++ b/reactos/dll/cpl/sysdm/es.rc @@ -24,23 +24,6 @@ BEGIN 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 "Identificacin 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 informacin 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 identificacin del red unirse a un dominio o crear un usuario local, pulse Identificacin 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 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" diff --git a/reactos/dll/cpl/sysdm/fr.rc b/reactos/dll/cpl/sysdm/fr.rc index 0d3204f1cd2..a54df87da5b 100644 --- a/reactos/dll/cpl/sysdm/fr.rc +++ b/reactos/dll/cpl/sysdm/fr.rc @@ -22,23 +22,6 @@ BEGIN 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駸eau" -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駸eau.",-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馭aut)",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駸eau, afin de rejoindre un domaine ou cr馥r un utilisateur local, cliquez sur Identification R駸eau.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(13)-ICONSIZE,LABELLINE(8)+5 - PUSHBUTTON "&Identification &r駸eau...",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騁駸.",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(13)-ICONSIZE,LABELLINE(12)+2 - PUSHBUTTON "&Propri騁駸...",IDC_NETWORK_PROPERTY,170,LABELLINE(11)+2,80,LABELLINE(1)+4 -END - IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Mat駻iel" diff --git a/reactos/dll/cpl/sysdm/hu.rc b/reactos/dll/cpl/sysdm/hu.rc index 4d1e68407a8..fffbb1a05c2 100644 --- a/reactos/dll/cpl/sysdm/hu.rc +++ b/reactos/dll/cpl/sysdm/hu.rc @@ -21,23 +21,6 @@ BEGIN 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疝zati azonost疽" -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 kvetkez inform當ikat fogja haszn疝ni g駱e azonost疽疉oz a h疝zaton.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - LTEXT "Teljes sz疥tg駱 n騅:",-1,PROPSHEETPADDING(1),LABELLINE(4)-4,PROPSHEETPADDING(17),LABELLINE(4)-4 - LTEXT "(Alap駻telmezett)",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疝zati azonost疽 var痙sl haszn疝at疱al akar csatlakozni egy tartom疣yhoz 駸 kv疣 l騁rehozni egy helyi felhaszn疝i fikot, akkor kattintson a H疝zati azonost疽 gombra.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5 - PUSHBUTTON "&H疝zati azonost疽...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 - LTEXT "A sz疥tg駱e 疸nevez駸馼ez, vagy annak tartom疣yba l駱tet駸馼ez kattintson a Tulajdons疊ok gombra.",-1,PROPSHEETPADDING(1),LABELLINE(11)+2,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(12)+2 - PUSHBUTTON "&Tulajdons疊ok...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4 -END - IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardver" diff --git a/reactos/dll/cpl/sysdm/nl.rc b/reactos/dll/cpl/sysdm/nl.rc index e981cc33e9d..36b81e26e31 100644 --- a/reactos/dll/cpl/sysdm/nl.rc +++ b/reactos/dll/cpl/sysdm/nl.rc @@ -20,23 +20,6 @@ BEGIN 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 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" diff --git a/reactos/dll/cpl/sysdm/precomp.h b/reactos/dll/cpl/sysdm/precomp.h index 04abdebef08..ff8a12a04f9 100644 --- a/reactos/dll/cpl/sysdm/precomp.h +++ b/reactos/dll/cpl/sysdm/precomp.h @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -33,7 +32,6 @@ void ShowLastWin32Error(HWND hWndOwner); /* 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); diff --git a/reactos/dll/cpl/sysdm/resource.h b/reactos/dll/cpl/sysdm/resource.h index 21531855fdc..c784346b53a 100644 --- a/reactos/dll/cpl/sysdm/resource.h +++ b/reactos/dll/cpl/sysdm/resource.h @@ -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 @@ -32,16 +31,6 @@ #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 */ #define IDD_PROPPAGEHARDWARE 300 #define IDC_HARDWARE_WIZARD 207 diff --git a/reactos/dll/cpl/sysdm/ru.rc b/reactos/dll/cpl/sysdm/ru.rc index 314c606c2b6..d3cdae640d1 100644 --- a/reactos/dll/cpl/sysdm/ru.rc +++ b/reactos/dll/cpl/sysdm/ru.rc @@ -20,23 +20,6 @@ BEGIN 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 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ホ碚蒡籵韃" diff --git a/reactos/dll/cpl/sysdm/sv.rc b/reactos/dll/cpl/sysdm/sv.rc index 6db4fce4644..02b2793542b 100644 --- a/reactos/dll/cpl/sysdm/sv.rc +++ b/reactos/dll/cpl/sysdm/sv.rc @@ -22,23 +22,6 @@ BEGIN 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舩verksidentitet" -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舅der fljande information fr att identifiera din dator p n舩verket.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - LTEXT "Fullst舅digt 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舩verksidentitet fr att anv舅da guiden N舩verksidentifikation fr att ansluta till en dom舅 och skapa en lokal anv舅dare.",-1,PROPSHEETPADDING(1),LABELLINE(7)+5,PROPSHEETWIDTH-PROPSHEETPADDING(12)-ICONSIZE,LABELLINE(8)+5 - PUSHBUTTON "&N舩verksidentitet...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 - LTEXT "Klicka p egenskaper fr att ansluta till en dom舅 eller 舅dra 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 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "H蚌dvara" diff --git a/reactos/dll/cpl/sysdm/sysdm.c b/reactos/dll/cpl/sysdm/sysdm.c index 947643c46ff..9845ebdce94 100644 --- a/reactos/dll/cpl/sysdm/sysdm.c +++ b/reactos/dll/cpl/sysdm/sysdm.c @@ -18,7 +18,7 @@ APPLET Applets[NUM_APPLETS] = {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,39 +58,79 @@ InitPropSheetPage(PROPSHEETHEADER *ppsh, WORD idDlg, DLGPROC DlgProc) return FALSE; } -/* First Applet */ +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); psh.dwFlags = PSH_PROPTITLE; 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 */ diff --git a/reactos/dll/cpl/sysdm/sysdm.rbuild b/reactos/dll/cpl/sysdm/sysdm.rbuild index 4ce78d42059..f00574ac4d8 100644 --- a/reactos/dll/cpl/sysdm/sysdm.rbuild +++ b/reactos/dll/cpl/sysdm/sysdm.rbuild @@ -12,14 +12,12 @@ user32 gdi32 comctl32 - netapi32 ntdll msimg32 shell32 shlwapi ole32 advanced.c - computer.c environment.c general.c hardprof.c diff --git a/reactos/dll/cpl/sysdm/sysdm.rc b/reactos/dll/cpl/sysdm/sysdm.rc index 2d316210e6d..de445b30f89 100644 --- a/reactos/dll/cpl/sysdm/sysdm.rc +++ b/reactos/dll/cpl/sysdm/sysdm.rc @@ -15,7 +15,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 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" diff --git a/reactos/dll/cpl/sysdm/uk.rc b/reactos/dll/cpl/sysdm/uk.rc index c2840eb1eef..c8eb611cdea 100644 --- a/reactos/dll/cpl/sysdm/uk.rc +++ b/reactos/dll/cpl/sysdm/uk.rc @@ -28,23 +28,6 @@ BEGIN 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 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "モ瑣籵" diff --git a/reactos/dll/win32/netid/lang/de-DE.rc b/reactos/dll/win32/netid/lang/de-DE.rc new file mode 100644 index 00000000000..7de86b3f098 --- /dev/null +++ b/reactos/dll/win32/netid/lang/de-DE.rc @@ -0,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 + */ + +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舅e 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舅e 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 knnen die Identifikation dieses Computers 舅dern.", IDC_STATIC, 6, 179, 250, 18 +END + diff --git a/reactos/dll/win32/netid/lang/en-US.rc b/reactos/dll/win32/netid/lang/en-US.rc new file mode 100644 index 00000000000..b73e1eb6e00 --- /dev/null +++ b/reactos/dll/win32/netid/lang/en-US.rc @@ -0,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 + diff --git a/reactos/dll/win32/netid/netid.c b/reactos/dll/win32/netid/netid.c new file mode 100644 index 00000000000..f7e59550537 --- /dev/null +++ b/reactos/dll/win32/netid/netid.c @@ -0,0 +1,88 @@ +/* + * PROJECT: ReactOS System Control Panel Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/netid/netid.c + * PURPOSE: Network ID Page + * COPYRIGHT: Copyright Thomas Weidenmueller + * + */ + +#include +#include +#include +#include "resource.h" + +static HINSTANCE hDllInstance; + +static INT_PTR CALLBACK +NetIDPageProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + LPWKSTA_INFO_101 wki; + INT_PTR Ret = 0; + + 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)) + { + 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 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; +} diff --git a/reactos/dll/win32/netid/netid.rbuild b/reactos/dll/win32/netid/netid.rbuild new file mode 100644 index 00000000000..0555a2cf0e2 --- /dev/null +++ b/reactos/dll/win32/netid/netid.rbuild @@ -0,0 +1,18 @@ + + + . + + 0x0500 + 0x0600 + 0x0600 + ntdll + kernel32 + user32 + gdi32 + comctl32 + advapi32 + netapi32 + netid.c + netid.rc + netid.spec + diff --git a/reactos/dll/win32/netid/netid.rc b/reactos/dll/win32/netid/netid.rc new file mode 100644 index 00000000000..d82e8f0db34 --- /dev/null +++ b/reactos/dll/win32/netid/netid.rc @@ -0,0 +1,14 @@ +#include +#include +#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 + +IDI_COMPNAME ICON "res/netid.ico" + +#include "lang/en-US.rc" +#include "lang/de-DE.rc" diff --git a/reactos/dll/win32/netid/netid.spec b/reactos/dll/win32/netid/netid.spec new file mode 100644 index 00000000000..3b4bc45aeb9 --- /dev/null +++ b/reactos/dll/win32/netid/netid.spec @@ -0,0 +1,4 @@ +# netid.dll exports + + 1 stdcall CreateNetIDPropertyPage() +# 2 stdcall ShowDcNotFoundErrorDialog(???) \ No newline at end of file diff --git a/reactos/dll/win32/netid/res/netid.ico b/reactos/dll/win32/netid/res/netid.ico new file mode 100644 index 0000000000000000000000000000000000000000..8bb9a29d5731d77427fc8c08e33027ff97bfdcd4 GIT binary patch literal 29926 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 Z_!J?;GDFvan+wp^!sq(J_^g`fe*h+$_M89! literal 0 HcmV?d00001 diff --git a/reactos/dll/win32/netid/resource.h b/reactos/dll/win32/netid/resource.h new file mode 100644 index 00000000000..f630bb7a6b9 --- /dev/null +++ b/reactos/dll/win32/netid/resource.h @@ -0,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 */ diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild index a440ef1c487..51d1b2012a9 100644 --- a/reactos/dll/win32/win32.rbuild +++ b/reactos/dll/win32/win32.rbuild @@ -136,6 +136,9 @@ + + +