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 00000000000..8bb9a29d573 Binary files /dev/null and b/reactos/dll/win32/netid/res/netid.ico differ 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 @@ + + +