Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[cwittich] 25524: fix some warnings (gcc 4.2 on Linux x64)

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Jan 19 04:00:06 2007 New Revision: 25524 URL: http://svn.reactos.org/svn/reactos?rev=25524&view=rev Log: fix some warnings (gcc 4.2 on Linux x64) Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h trunk/reactos/tools/pefixup.c Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.h (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h Fri Jan 19 04:00:06 2007 @@ -714,7 +714,7 @@ return super::find(x); } - XS_String get(const char* x, LPXSSTR def=XS_EMPTY_STR) const + XS_String get(const char* x, LPCXSSTR def=XS_EMPTY_STR) const { const_iterator found = find(x); @@ -728,7 +728,7 @@ /// map of XML node attributes struct AttributeMap : public std::map<XS_String, XS_String> { - XS_String get(const char* x, LPXSSTR def=XS_EMPTY_STR) const + XS_String get(const char* x, LPCXSSTR def=XS_EMPTY_STR) const { const_iterator found = find(x); @@ -848,7 +848,7 @@ } /// read only access to an attribute - template<typename T> XS_String get(const T& attr_name, LPXSSTR def=XS_EMPTY_STR) const + template<typename T> XS_String get(const T& attr_name, LPCXSSTR def=XS_EMPTY_STR) const { AttributeMap::const_iterator found = _attributes.find(attr_name); Modified: trunk/reactos/tools/pefixup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.c?rev=25524&… ============================================================================== --- trunk/reactos/tools/pefixup.c (original) +++ trunk/reactos/tools/pefixup.c Fri Jan 19 04:00:06 2007 @@ -24,6 +24,9 @@ #include <stdlib.h> #include <string.h> #include <fcntl.h> +#ifndef _WIN32 +#include <unistd.h> +#endif #ifndef O_BINARY #define O_BINARY 0

17 years, 11 months

[weiden] 25523: Fix freeing memory

by weiden＠svn.reactos.org

Author: weiden Date: Fri Jan 19 03:23:48 2007 New Revision: 25523 URL: http://svn.reactos.org/svn/reactos?rev=25523&view=rev Log: Fix freeing memory Modified: trunk/reactos/dll/win32/netid/netid.c Modified: trunk/reactos/dll/win32/netid/netid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.c?re… ============================================================================== --- trunk/reactos/dll/win32/netid/netid.c (original) +++ trunk/reactos/dll/win32/netid/netid.c Fri Jan 19 03:23:48 2007 @@ -20,7 +20,6 @@ IN WPARAM wParam, IN LPARAM lParam) { - LPWKSTA_INFO_101 wki; INT_PTR Ret = 0; UNREFERENCED_PARAMETER(lParam); @@ -31,6 +30,7 @@ case WM_INITDIALOG: { /* Display computer name */ + LPWKSTA_INFO_101 wki = NULL; DWORD Size = MAX_COMPUTERNAME_LENGTH + 1; TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; if (GetComputerName(ComputerName,&Size)) @@ -46,8 +46,10 @@ SetDlgItemText(hwndDlg, IDC_WORKGROUPDOMAIN_NAME, wki->wki101_langroup); - NetApiBufferFree(&wki); } + + if (wki != NULL) + NetApiBufferFree(wki); Ret = TRUE; break;

17 years, 11 months

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

by weiden＠svn.reactos.org

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 <w3seek(a)reactos.org> - * - */ - -#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 <mail(a)colinfinck.de> + */ + +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 <w3seek(a)reactos.org> * */ -#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>

17 years, 11 months

[weiden] 25521: set eol-style to native

by weiden＠svn.reactos.org

Author: weiden Date: Fri Jan 19 02:42:21 2007 New Revision: 25521 URL: http://svn.reactos.org/svn/reactos?rev=25521&view=rev Log: set eol-style to native Modified: trunk/reactos/dll/win32/beepmidi/ (props changed) trunk/reactos/dll/win32/beepmidi/beepmidi.c (props changed) trunk/reactos/dll/win32/beepmidi/beepmidi.def (props changed) trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild (props changed) trunk/reactos/dll/win32/beepmidi/readme.txt (props changed) Propchange: trunk/reactos/dll/win32/beepmidi/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Jan 19 02:42:21 2007 @@ -1,0 +1,3 @@ +GNUmakefile +*.vcproj +*.user Propchange: trunk/reactos/dll/win32/beepmidi/beepmidi.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/beepmidi/beepmidi.def ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/beepmidi/readme.txt ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 11 months

[silverblade] 25520: PC speaker MIDI driver (see README.TXT for info) Tested on Windows XP but should be compatible with ReactOS

by silverblade＠svn.reactos.org

Author: silverblade Date: Fri Jan 19 02:26:30 2007 New Revision: 25520 URL: http://svn.reactos.org/svn/reactos?rev=25520&view=rev Log: PC speaker MIDI driver (see README.TXT for info) Tested on Windows XP but should be compatible with ReactOS Added: trunk/reactos/dll/win32/beepmidi/ trunk/reactos/dll/win32/beepmidi/beepmidi.c trunk/reactos/dll/win32/beepmidi/beepmidi.def trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild trunk/reactos/dll/win32/beepmidi/readme.txt Added: trunk/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.c (added) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.c Fri Jan 19 02:26:30 2007 @@ -1,0 +1,903 @@ +/* + BeepMidi :: beep.sys MIDI player + + (c) Andrew Greenwood, 2007. + + Released as open-source software. You may copy, re-distribute and modify + this software, provided this copyright notice remains intact. + + Please see the included README.TXT for more information + + HISTORY : + 16th January 2007 Started + 17th January 2007 Polyphony support and threading added + 18th January 2007 Made threading optional, added comments +*/ + +/* The timeslice to allocate for all playing notes (in milliseconds) */ +#define TIMESLICE_SIZE 60 + +/* + If this is defined, notes are added to the playing list, even if + they already exist. As a result, the note will sound twice during + each timeslice. Also each note on will require a corresponding note + off event. +*/ +#define ALLOW_DUPLICATE_NOTES + +/* + The maximum number of notes that may be playing at any one time. + Higher values result in a messier sound as all the frequencies get + mashed together. Do not set this below 2. Recommended = 4 +*/ +#define POLYPHONY 3 + +/* + Define CONTINUOUS_NOTES to perform note playback in a separate thread. + This was originally the intended behaviour, but after experimentation + doesn't sound as good for MIDI files which have a lot going on. If not + defined, all playing notes are output in sequence as a new note starts. +*/ +#define CONTINUOUS_NOTES + +#define WIN32_NO_STATUS +#define NTOS_MODE_USER +#include <windows.h> +#include <ndk/ntndk.h> +#include <stdio.h> +#include <ntddbeep.h> +#include <math.h> + +#include <mmddk.h> +#include <mmsystem.h> + +#define DPRINT printf +//#define DPRINT // + +/* A few MIDI command categories */ +#define MIDI_NOTE_OFF 0x80 +#define MIDI_NOTE_ON 0x90 +#define MIDI_CONTROL_CHANGE 0xB0 +#define MIDI_PROGRAM 0xC0 +#define MIDI_PITCH_BEND 0xE0 +#define MIDI_SYSTEM 0xFF + +/* Specific commands */ +#define MIDI_RESET 0xFF + + +typedef struct _NoteNode +{ + struct _NoteNode* next; + struct _NoteNode* previous; + + UCHAR note; + UCHAR velocity; /* 0 is note-off */ +} NoteNode; + +typedef struct _DeviceInfo +{ + HDRVR mme_handle; + HANDLE kernel_device; + + DWORD callback; + DWORD instance; + DWORD flags; + + UCHAR running_status; + + DWORD playing_notes_count; + NoteNode* note_list; + BOOL refresh_notes; + + HANDLE thread_handle; + BOOL terminate_thread; + HANDLE thread_termination_complete; +} DeviceInfo; + +DeviceInfo* the_device; +CRITICAL_SECTION device_lock; + +void +FakePrintf(char* str, ...) +{ + /* Just to shut the compiler up */ +} + + +/* + This is designed to be treated as a thread, however it behaves as a + normal function if CONTINUOUS_NOTES is not defined. +*/ + +DWORD WINAPI +ProcessPlayingNotes( + LPVOID parameter) +{ + DeviceInfo* device_info = (DeviceInfo*) parameter; + NTSTATUS status; + IO_STATUS_BLOCK io_status_block; + DWORD arp_notes; + + DPRINT("Note processing started\n"); + + /* We lock the note list only while accessing it */ + +#ifdef CONTINUOUS_NOTES + while ( ! device_info->terminate_thread ) +#endif + { + NoteNode* node; + + /* Number of notes being arpeggiated */ + arp_notes = 1; + + EnterCriticalSection(&device_lock); + + /* Calculate how much time to allocate to each playing note */ + + DPRINT("%d notes active\n", (int) device_info->playing_notes_count); + + node = device_info->note_list; + + while ( ( node != NULL ) && ( arp_notes <= POLYPHONY ) ) + { + DPRINT("playing..\n"); + BEEP_SET_PARAMETERS beep_data; + DWORD actually_playing = 0; + + double frequency = node->note; + frequency = frequency / 12; + frequency = pow(2, frequency); + frequency = 8.1758 * frequency; + + if (device_info->playing_notes_count > POLYPHONY) + actually_playing = POLYPHONY; + else + actually_playing = device_info->playing_notes_count; + + DPRINT("Frequency %f\n", frequency); + + // TODO + beep_data.Frequency = (DWORD) frequency; + beep_data.Duration = TIMESLICE_SIZE / actually_playing; /* device_info->playing_notes_count; */ + + status = NtDeviceIoControlFile(device_info->kernel_device, + NULL, + NULL, + NULL, + &io_status_block, + IOCTL_BEEP_SET, + &beep_data, + sizeof(BEEP_SET_PARAMETERS), + NULL, + 0); + + if ( ! NT_SUCCESS(status) ) + { + DPRINT("ERROR %d\n", (int) GetLastError()); + } + + SleepEx(beep_data.Duration, TRUE); + + if ( device_info->refresh_notes ) + { + device_info->refresh_notes = FALSE; + break; + } + + arp_notes ++; + node = node->next; + } + + LeaveCriticalSection(&device_lock); + } + +#ifdef CONTINUOUS_NOTES + SetEvent(device_info->thread_termination_complete); +#endif + + return 0; +} + + +/* + Fills a MIDIOUTCAPS structure with information about our device. +*/ + +MMRESULT +GetDeviceCapabilities( + MIDIOUTCAPS* caps) +{ + /* These are ignored for now */ + caps->wMid = 0; + caps->wPid = 0; + + caps->vDriverVersion = 0x0100; + + memset(caps->szPname, 0, sizeof(caps->szPname)); + memcpy(caps->szPname, L"PC speaker\0", strlen("PC speaker\0") * 2); + + caps->wTechnology = MOD_SQSYNTH; + + caps->wVoices = 1; /* We only have one voice */ + caps->wNotes = POLYPHONY; + caps->wChannelMask = 0xFFBF; /* Ignore channel 10 */ + + caps->dwSupport = 0; + + return MMSYSERR_NOERROR; +} + + +/* + Helper function that just simplifies calling the application making use + of us. +*/ + +BOOL +CallClient( + DeviceInfo* device_info, + DWORD message, + DWORD parameter1, + DWORD parameter2) +{ + DPRINT("Calling client - callback 0x%x mmhandle 0x%x\n", (int) device_info->callback, (int) device_info->mme_handle); + return DriverCallback(device_info->callback, + HIWORD(device_info->flags), + device_info->mme_handle, + message, + device_info->instance, + parameter1, + parameter2); + +} + + +/* + Open the kernel-mode device and allocate resources. This opens the + BEEP.SYS kernel device. +*/ + +MMRESULT +OpenDevice( + DeviceInfo** private_data, + MIDIOPENDESC* open_desc, + DWORD flags) +{ + NTSTATUS status; + HANDLE heap; + HANDLE kernel_device; + UNICODE_STRING beep_device_name; + OBJECT_ATTRIBUTES attribs; + IO_STATUS_BLOCK status_block; + + /* One at a time.. */ + if ( the_device ) + { + DPRINT("Already allocated\n"); + return MMSYSERR_ALLOCATED; + } + + /* Make the device name into a unicode string and open it */ + + RtlInitUnicodeString(&beep_device_name, + L"\\Device\\Beep"); + + InitializeObjectAttributes(&attribs, + &beep_device_name, + 0, + NULL, + NULL); + + status = NtCreateFile(&kernel_device, + FILE_READ_DATA | FILE_WRITE_DATA, + &attribs, + &status_block, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN_IF, + 0, + NULL, + 0); + + if ( ! NT_SUCCESS(status) ) + { + DPRINT("Could not connect to BEEP device - %d\n", (int) GetLastError()); + return MMSYSERR_ERROR; + } + + DPRINT("Opened!\n"); + + /* Allocate and initialize the device info */ + + heap = GetProcessHeap(); + + the_device = HeapAlloc(heap, HEAP_ZERO_MEMORY, sizeof(DeviceInfo)); + + if ( ! the_device ) + { + DPRINT("Out of memory\n"); + return MMSYSERR_NOMEM; + } + + /* Initialize */ + the_device->kernel_device = kernel_device; + the_device->playing_notes_count = 0; + the_device->note_list = NULL; + the_device->thread_handle = 0; + the_device->terminate_thread = FALSE; + the_device->running_status = 0; + + // TODO + the_device->mme_handle = (HDRVR) open_desc->hMidi; + the_device->callback = open_desc->dwCallback; + the_device->instance = open_desc->dwInstance; + the_device->flags = flags; + + /* Store the pointer in the user data */ + *private_data = the_device; + + /* This is threading-related code */ +#ifdef CONTINUOUS_NOTES + the_device->thread_termination_complete = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( ! the_device->thread_termination_complete ) + { + DPRINT("CreateEvent failed\n"); + HeapFree(heap, 0, the_device); + return MMSYSERR_NOMEM; + } + + the_device->thread_handle = CreateThread(NULL, + 0, + ProcessPlayingNotes, + (PVOID) the_device, + 0, + NULL); + + if ( ! the_device->thread_handle ) + { + DPRINT("CreateThread failed\n"); + CloseHandle(the_device->thread_termination_complete); + HeapFree(heap, 0, the_device); + return MMSYSERR_NOMEM; + } +#endif + + /* Now we call the client application to say the device is open */ + DPRINT("Sending MOM_OPEN\n"); + DPRINT("Success? %d\n", (int) CallClient(the_device, MOM_OPEN, 0, 0)); + + return MMSYSERR_NOERROR; +} + + +/* + Close the kernel-mode device. +*/ + +MMRESULT +CloseDevice(DeviceInfo* device_info) +{ + HANDLE heap = GetProcessHeap(); + + /* If we're working in threaded mode we need to wait for thread to die */ +#ifdef CONTINUOUS_NOTES + the_device->terminate_thread = TRUE; + + WaitForSingleObject(the_device->thread_termination_complete, INFINITE); + + CloseHandle(the_device->thread_termination_complete); +#endif + + /* Let the client application know the device is closing */ + DPRINT("Sending MOM_CLOSE\n"); + CallClient(device_info, MOM_CLOSE, 0, 0); + + NtClose(device_info->kernel_device); + + /* Free resources */ + HeapFree(heap, 0, device_info); + + the_device = NULL; + + return MMSYSERR_NOERROR; +} + + +/* + Removes a note from the playing notes list. If the note is not playing, + we just pretend nothing happened. +*/ + +MMRESULT +StopNote( + DeviceInfo* device_info, + UCHAR note) +{ + HANDLE heap = GetProcessHeap(); + NoteNode* node; + NoteNode* prev_node = NULL; + + DPRINT("StopNote\n"); + + EnterCriticalSection(&device_lock); + + node = device_info->note_list; + + while ( node != NULL ) + { + if ( node->note == note ) + { + /* Found the note - just remove the node from the list */ + + DPRINT("Stopping note %d\n", (int) node->note); + + if ( prev_node != NULL ) + prev_node->next = node->next; + else + device_info->note_list = node->next; + + HeapFree(heap, 0, node); + + device_info->playing_notes_count --; + + DPRINT("Note stopped - now playing %d notes\n", (int) device_info->playing_notes_count); + + LeaveCriticalSection(&device_lock); + device_info->refresh_notes = TRUE; + + return MMSYSERR_NOERROR; + } + + prev_node = node; + node = node->next; + } + + LeaveCriticalSection(&device_lock); + + /* Hmm, a good idea? */ +#ifndef CONTINUOUS_NOTES + ProcessPlayingNotes((PVOID) device_info); +#endif + + return MMSYSERR_NOERROR; +} + + +/* + Adds a note to the playing notes list. If the note is already playing, + the definition of ALLOW_DUPLICATE_NOTES determines if an existing note + may be duplicated. Otherwise, duplicate notes are ignored. +*/ + +MMRESULT +PlayNote( + DeviceInfo* device_info, + UCHAR note, + UCHAR velocity) +{ + HANDLE heap = GetProcessHeap(); + + DPRINT("PlayNote\n"); + + NoteNode* node; + + if ( velocity == 0 ) + { + DPRINT("Zero velocity\n"); + + /* Velocity zero is effectively a "note off" */ + StopNote(device_info, note); + } + else + { + /* Start playing the note */ + NoteNode* new_node; + NoteNode* tail_node = NULL; + + EnterCriticalSection(&device_lock); + + node = device_info->note_list; + + while ( node != NULL ) + { +#ifndef ALLOW_DUPLICATE_NOTES + if ( ( node->note == note ) && ( velocity > 0 ) ) + { + /* The note is already playing - do nothing */ + DPRINT("Duplicate note playback request ignored\n"); + LeaveCriticalSection(&device_lock); + return MMSYSERR_NOERROR; + } +#endif + + tail_node = node; + node = node->next; + } + + new_node = HeapAlloc(heap, HEAP_ZERO_MEMORY, sizeof(NoteNode)); + + if ( ! new_node ) + { + LeaveCriticalSection(&device_lock); + return MMSYSERR_NOMEM; + } + + new_node->note = note; + new_node->velocity = velocity; + + /* + Prepend to the playing notes list. If exceeding polyphony, + remove the oldest note (which will be at the tail.) + */ + + if ( device_info->note_list ) + device_info->note_list->previous = new_node; + + new_node->next = device_info->note_list; + new_node->previous = NULL; + + device_info->note_list = new_node; + device_info->playing_notes_count ++; + +/* + if ( device_info->playing_notes_count > POLYPHONY ) + { + ASSERT(tail_node); + + DPRINT("Polyphony exceeded\n"); + + tail_node->previous->next = NULL; + + HeapFree(heap, 0, tail_node); + + device_info->playing_notes_count --; + } +*/ + + LeaveCriticalSection(&device_lock); + + DPRINT("Note started - now playing %d notes\n", (int) device_info->playing_notes_count); + device_info->refresh_notes = TRUE; + } + +#ifndef CONTINUOUS_NOTES + ProcessPlayingNotes((PVOID) device_info); +#endif + + return MMSYSERR_NOERROR; +} + +/* + Decipher a short MIDI message (which is a MIDI message packed into a DWORD.) + This will set "running status", but does not take this into account when + processing messages (is this necessary?) +*/ + +MMRESULT +ProcessShortMidiMessage( + DeviceInfo* device_info, + DWORD message) +{ + DWORD status; + + DWORD category; + DWORD channel; + DWORD data1, data2; + + status = message & 0x000000FF; + + /* Deal with running status */ + + if ( status < MIDI_NOTE_OFF ) + { + status = device_info->running_status; + } + + /* Ensure the status is sane! */ + + if ( status < MIDI_NOTE_OFF ) + { + /* It's garbage, ignore it */ + return MMSYSERR_NOERROR; + } + + /* Figure out the message category and channel */ + + category = status & 0xF0; + channel = status & 0x0F; /* we don't use this */ + + data1 = (message & 0x0000FF00) >> 8; + data2 = (message & 0x00FF0000) >> 16; + + DPRINT("0x%x, %d, %d\n", (int) status, (int) data1, (int) data2); + + /* Filter drums (which are *usually* on channel 10) */ + if ( channel == 10 ) + { + return MMSYSERR_NOERROR; + } + + /* Pass to the appropriate message handler */ + + switch ( category ) + { + case MIDI_NOTE_ON : + { + PlayNote(device_info, data1, data2); + break; + } + + case MIDI_NOTE_OFF : + { + StopNote(device_info, data1); + break; + } + } + + return MMSYSERR_NOERROR; +} + + +#define PACK_MIDI(b1, b2, b3) \ + ((b3 * 65536) + (b2 * 256) + b1); + + +/* + Processes a "long" MIDI message (ie, a MIDI message contained within a + buffer.) This is intended for supporting SysEx data, or blocks of MIDI + events. However in our case we're only interested in short MIDI messages, + so we scan the buffer, and each time we encounter a valid status byte + we start recording it as a new event. Once 3 bytes or a new status is + received, the event is passed to the short message handler. +*/ + +MMRESULT +ProcessLongMidiMessage( + DeviceInfo* device_info, + MIDIHDR* header) +{ + int index = 0; + UCHAR* midi_bytes = (UCHAR*) header->lpData; + + int msg_index = 0; + UCHAR msg[3]; + + /* Initialize the buffer */ + msg[0] = msg[1] = msg[2] = 0; + + if ( ! ( header->dwFlags & MHDR_PREPARED ) ) + { + DPRINT("Not prepared!\n"); + return MIDIERR_UNPREPARED; + } + + DPRINT("Processing %d bytes of MIDI\n", (int) header->dwBufferLength); + + while ( index < header->dwBufferLength ) + { + /* New status byte? ( = new event) */ + if ( midi_bytes[index] & 0x80 ) + { + DWORD short_msg; + + /* Deal with the existing event */ + + if ( msg[0] & 0x80 ) + { + short_msg = PACK_MIDI(msg[0], msg[1], msg[2]); + + DPRINT("Complete msg is 0x%x %d %d\n", (int) msg[0], (int) msg[1], (int) msg[2]); + ProcessShortMidiMessage(device_info, short_msg); + } + + /* Set new running status and start recording the event */ + DPRINT("Set new running status\n"); + device_info->running_status = midi_bytes[index]; + msg[0] = midi_bytes[index]; + msg_index = 1; + } + + /* Unexpected data byte? ( = re-use previous status) */ + else if ( msg_index == 0 ) + { + if ( device_info->running_status & 0x80 ) + { + DPRINT("Retrieving running status\n"); + msg[0] = device_info->running_status; + msg[1] = midi_bytes[index]; + msg_index = 2; + } + else + DPRINT("garbage\n"); + } + + /* Expected data ( = append to message until buffer full) */ + else + { + DPRINT("Next byte...\n"); + msg[msg_index] = midi_bytes[index]; + msg_index ++; + + if ( msg_index > 2 ) + { + DWORD short_msg; + + short_msg = PACK_MIDI(msg[0], msg[1], msg[2]); + + DPRINT("Complete msg is 0x%x %d %d\n", (int) msg[0], (int) msg[1], (int) msg[2]); + ProcessShortMidiMessage(device_info, short_msg); + + /* Reinit */ + msg_index = 0; + msg[0] = msg[1] = msg[2] = 0; + } + } + + index ++; + } + + /* + We're meant to clear MHDR_DONE and set MHDR_INQUEUE but since we + deal with everything here and now we might as well just say so. + */ + header->dwFlags |= MHDR_DONE; + header->dwFlags &= ~ MHDR_INQUEUE; + + DPRINT("Success? %d\n", (int) CallClient(the_device, MOM_DONE, (DWORD) header, 0)); + + return MMSYSERR_NOERROR; +} + + +/* + Exported function that receives messages from WINMM (the MME API.) +*/ + +FAR PASCAL +MMRESULT +modMessage( + UINT device_id, + UINT message, + DWORD private_data, + DWORD parameter1, + DWORD parameter2) +{ + switch ( message ) + { + case MODM_GETNUMDEVS : + { + /* Only one internal PC speaker device (and even that's too much) */ + DPRINT("MODM_GETNUMDEVS\n"); + return 1; + } + + case MODM_GETDEVCAPS : + { + DPRINT("MODM_GETDEVCAPS\n"); + return GetDeviceCapabilities((MIDIOUTCAPS*) parameter1); + } + + case MODM_OPEN : + { + DPRINT("MODM_OPEN\n"); + + return OpenDevice((DeviceInfo**) private_data, + (MIDIOPENDESC*) parameter1, + parameter2); + } + + case MODM_CLOSE : + { + DPRINT("MODM_CLOSE\n"); + return CloseDevice((DeviceInfo*) private_data); + } + + case MODM_DATA : + { + return ProcessShortMidiMessage((DeviceInfo*) private_data, parameter1); + } + + case MODM_PREPARE : + { + /* We don't bother with this */ + MIDIHDR* hdr = (MIDIHDR*) parameter1; + hdr->dwFlags |= MHDR_PREPARED; + return MMSYSERR_NOERROR; + } + + case MODM_UNPREPARE : + { + MIDIHDR* hdr = (MIDIHDR*) parameter1; + hdr->dwFlags &= ~MHDR_PREPARED; + return MMSYSERR_NOERROR; + } + + case MODM_LONGDATA : + { + DPRINT("LONGDATA\n"); + return ProcessLongMidiMessage((DeviceInfo*) private_data, (MIDIHDR*) parameter1); + } + + case MODM_RESET : + { + /* TODO */ + break; + } + } + + DPRINT("Not supported %d\n", message); + + return MMSYSERR_NOTSUPPORTED; +} + + +/* + Driver entrypoint. +*/ + +FAR PASCAL LONG +DriverProc( + DWORD driver_id, + HDRVR driver_handle, + UINT message, + LONG parameter1, + LONG parameter2) +{ + switch ( message ) + { + case DRV_LOAD : + DPRINT("DRV_LOAD\n"); + the_device = NULL; + return 1L; + + case DRV_FREE : + DPRINT("DRV_FREE\n"); + return 1L; + + case DRV_OPEN : + DPRINT("DRV_OPEN\n"); + InitializeCriticalSection(&device_lock); + return 1L; + + case DRV_CLOSE : + DPRINT("DRV_CLOSE\n"); + return 1L; + + case DRV_ENABLE : + DPRINT("DRV_ENABLE\n"); + return 1L; + + case DRV_DISABLE : + DPRINT("DRV_DISABLE\n"); + return 1L; + + /* + We don't provide configuration capabilities. This used to be + for things like I/O port, IRQ, DMA settings, etc. + */ + + case DRV_QUERYCONFIGURE : + DPRINT("DRV_QUERYCONFIGURE\n"); + return 0L; + + case DRV_CONFIGURE : + DPRINT("DRV_CONFIGURE\n"); + return 0L; + + case DRV_INSTALL : + DPRINT("DRV_INSTALL\n"); + return DRVCNF_RESTART; + }; + + DPRINT("???\n"); + + return DefDriverProc(driver_id, + driver_handle, + message, + parameter1, + parameter2); +} Added: trunk/reactos/dll/win32/beepmidi/beepmidi.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.def (added) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.def Fri Jan 19 02:26:30 2007 @@ -1,0 +1,12 @@ +; beepmidi.def +; +; BeepMidi driver by Andrew Greenwood +; +; For ReactOS Operating System +; + +LIBRARY beepmidi.dll + +EXPORTS +DriverProc@20 +modMessage@20 Added: trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild (added) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild Fri Jan 19 02:26:30 2007 @@ -1,0 +1,12 @@ +<module name="beepmidi" type="win32dll" installbase="system32" installname="beepmidi.dll"> + <importlibrary definition="beepmidi.def" /> + <include base="beepmidi">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>winmm</library> + <file>beepmidi.c</file> +</module> Added: trunk/reactos/dll/win32/beepmidi/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/readme.… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/readme.txt (added) +++ trunk/reactos/dll/win32/beepmidi/readme.txt Fri Jan 19 02:26:30 2007 @@ -1,0 +1,51 @@ +BEEPMIDI :: BEEP.SYS MIDI DRIVER +(c) Andrew Greenwood, 2007. + +http://www.silverblade.co.uk + +Released as open-source software. You may copy, re-distribute and modify +this software, provided this copyright notice remains intact. + +WHAT'S THIS ? + BeepMidi is a MME MIDI driver for NT-compatible operating systems, + which uses BEEP.SYS (the kernel-mode PC speaker driver) to play + MIDI data. It installs as a standard MIDI output device and can even + be selected as your default MIDI output device. The fundamental + code for interacting with BEEP.SYS was taken from ReactOS' kernel32 + module. + +WHY WAS THIS WRITTEN ? + Primarily for educational reasons - in the process, I've learned more + about the driver side of the MME API and how to interact with kernel + device drivers. It aids as a good starting point from which to + move on to bigger and better things :) + +HOW TO INSTALL : + Copy the file to C:\WINDOWS\SYSTEM32\BEEPMIDI.DLL + + Go into HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ + Drivers32 in RegEdit and look for the "midi" entries on the right hand + side. Find the highest numbered one (eg: midi1) and create a new STRING + value. Give it another midi name, but one above the current highest + entry present (eg: midi2.) + + You'll now see a "PC Speaker" entry in Sound & Audio Devices. + +TWEAKING: + See the comments toward the top of beepmidi.c for tweakable driver + parameters. These can only be adjusted in the source code at present. + +FEATURES : + * Supports note-on and note-off messages on channels 1-9 and 11-16 + (channel 10 is rhythm, which is not supported.) + * Fake polyphony (actually just arpeggiates playing notes!) + * Threaded design for continuous playback (optional.) + +ROOM FOR IMPROVEMENT : + * Pitch bend is not supported + * Velocity could determine timeslice + * Should wait for timeslice to complete before adding/removing notes + * Would be nice to allow configuration of polyphony etc. via Control Panel + +BUGS : + * Crashes when used with Windows Media Player (mplayer2 is fine though)

17 years, 11 months

[janderwald] 25519: - forgot these changes in my local svn - generating dependency map works - results can be viewed with XSL capable browser

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Jan 19 01:37:10 2007 New Revision: 25519 URL: http://svn.reactos.org/svn/reactos?rev=25519&view=rev Log: - forgot these changes in my local svn - generating dependency map works - results can be viewed with XSL capable browser Modified: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp Modified: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/depen… ============================================================================== --- trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp (original) +++ trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp Fri Jan 19 01:37:10 2007 @@ -150,7 +150,7 @@ } fprintf ( m_DepMapFile, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\r\n" ); - //fprintf ( m_DepMapFile, "<?xml-stylesheet type=\"text/xsl\" href=\"depmap.xsl\"?>\r\n" ); + fprintf ( m_DepMapFile, "<?xml-stylesheet type=\"text/xsl\" href=\"depmap.xsl\"?>\r\n" ); fprintf ( m_DepMapFile, "<components>\r\n" ); for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) @@ -164,8 +164,12 @@ - fprintf ( m_DepMapFile, "<component name=\"%s\" base=\"%s\" ref_count=\"%u\" library_count=\"%u\">\r\n", module.name.c_str(), module.GetBasePath ().c_str (), (unsigned int) data->references.size (), (unsigned int) data->libraries.size () ); - + fprintf ( m_DepMapFile, "\t<component>\r\n" ); + fprintf ( m_DepMapFile, "\t\t<name>%s</name>\r\n", module.name.c_str () ); + fprintf ( m_DepMapFile, "\t\t<base>%s</base>\r\n", module.GetBasePath ().c_str () ); + fprintf ( m_DepMapFile, "\t\t<ref_count>%u</ref_count>\r\n", (unsigned int)data->references.size () ); + fprintf ( m_DepMapFile, "\t\t<lib_count>%u</lib_count>\r\n", (unsigned int)data->libraries.size () ); +#if 0 if ( data->references.size () ) { fprintf ( m_DepMapFile, "\t<references>\r\n" ); @@ -185,8 +189,8 @@ } fprintf ( m_DepMapFile, "\t</libraries>\r\n" ); } - - fprintf ( m_DepMapFile, "</component>\r\n" ); +#endif + fprintf ( m_DepMapFile, "\t</component>\r\n" ); } }

17 years, 11 months

[greatlrd] 25518: Fixing another bug in converting PPC stwu r1,-32(r1) equal with intel mov [esp-32],esp; mov esp, esp - 32;

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jan 19 01:09:08 2007 New Revision: 25518 URL: http://svn.reactos.org/svn/reactos?rev=25518&view=rev Log: Fixing another bug in converting PPC stwu r1,-32(r1) equal with intel mov [esp-32],esp; mov esp, esp - 32; Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c trunk/rosapps/devutils/cputointel/any_op.h Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c Fri Jan 19 01:09:08 2007 @@ -190,7 +190,7 @@ { /* dest [eax - 0x20], source reg */ - fprintf(outfp,"mov ["); + fprintf(outfp,"mov dword ["); standardreg( RegTableCount, pMystart->dst, setup_ebp, outfp); @@ -199,6 +199,19 @@ pMystart->src, setup_ebp, outfp); fprintf(outfp,"\n"); + + if ((pMystart->type & 128)== 128) + { + fprintf(outfp,"mov "); + standardreg( RegTableCount, + pMystart->src, + setup_ebp, outfp); + fprintf(outfp," , "); + standardreg( RegTableCount, + pMystart->dst, + setup_ebp, outfp); + fprintf(outfp," %d\n",pMystart->dst_extra); + } } } Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Fri Jan 19 01:09:08 2007 @@ -116,7 +116,7 @@ tmp = _byteswap_ushort( ((CPU_SHORT)((opcode >> 16) & 0xffff))); pMyBrainAnalys->op = OP_ANY_mov; - pMyBrainAnalys->type= 2 + 64; + pMyBrainAnalys->type= 2 + 64 + 128; pMyBrainAnalys->src_size = 32; pMyBrainAnalys->dst_size = 32; pMyBrainAnalys->src = PPC_GetBitArrayBto31xx(opcode); Modified: trunk/rosapps/devutils/cputointel/any_op.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/any_op… ============================================================================== --- trunk/rosapps/devutils/cputointel/any_op.h (original) +++ trunk/rosapps/devutils/cputointel/any_op.h Fri Jan 19 01:09:08 2007 @@ -33,6 +33,7 @@ /* 16 = source are imm */ /* 32 = soucre -xx(r1) or [eax-xx] */ /* 64 = dest -xx(r1) or [eax-xx] */ + /* 128 = update form the src be update with dest */ CPU_INT src_size; /* who many bits are src not vaild for reg*/ CPU_INT dst_size; /* who many bits are dst not vaild for reg*/

17 years, 11 months

[greatlrd] 25517: Adding stwu to converting to ia32 fixing some smaller bug when it was disabmler fixing dymatic translations of abi for ppc and ia32

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jan 19 00:35:48 2007 New Revision: 25517 URL: http://svn.reactos.org/svn/reactos?rev=25517&view=rev Log: Adding stwu to converting to ia32 fixing some smaller bug when it was disabmler fixing dymatic translations of abi for ppc and ia32 Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c trunk/rosapps/devutils/cputointel/CpuToIntel.c trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c trunk/rosapps/devutils/cputointel/any_op.h Modified: trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertToIA32Process.c Fri Jan 19 00:35:48 2007 @@ -28,6 +28,57 @@ * mmx/sse/fpu 7 = 28 */ +static void standardreg(CPU_INT *RegTableCount, CPU_UNINT reg, CPU_INT setup_ebp, FILE *outfp) +{ + /* eax */ + if (reg == RegTableCount[3]) + { + fprintf(outfp,"eax"); + } + /* ebp */ + else if (reg == RegTableCount[31]) + { + fprintf(outfp,"ebp"); + } + /* edx */ + else if (reg == RegTableCount[4]) + { + fprintf(outfp,"edx"); + } + /* esp */ + else if (reg == RegTableCount[1]) + { + fprintf(outfp,"esp"); + } + /* ecx */ + else if (reg == RegTableCount[8]) + { + fprintf(outfp,"ecx"); + } + /* ebx */ + else if (reg == RegTableCount[9]) + { + fprintf(outfp,"ebx"); + } + /* esi */ + else if (reg == RegTableCount[10]) + { + fprintf(outfp,"esi"); + } + /* edi */ + else if (reg == RegTableCount[10]) + { + fprintf(outfp,"edi"); + } + else + { + if (setup_ebp == 1) + fprintf(outfp,"dword [ebx - %d]"); + else + fprintf(outfp,"; unsuported should not happen it happen :(\n"); + } +} + CPU_INT ConvertToIA32Process( FILE *outfp, PMYBrainAnalys pMystart, PMYBrainAnalys pMyend, CPU_INT regbits, @@ -108,99 +159,52 @@ if ((pMystart->type & 16)== 16) { /* source are imm */ - - /* - * esi = 10 - * edi = 11 */ - - /* eax */ - if (pMystart->dst == RegTableCount[3]) + if ((pMystart->src == 0) && + (setup_ebp == 0)) { - if (pMystart->src == 0) - fprintf(outfp,"xor eax,eax\n"); - else - fprintf(outfp,"mov eax,%llu\n",pMystart->src); - } - /* ebp */ - else if (pMystart->dst == RegTableCount[31]) - { - if (pMystart->src == 0) - fprintf(outfp,"xor ebp,ebp\n"); - else - fprintf(outfp,"mov ebp,%llu\n",pMystart->src); - } - /* edx */ - else if (pMystart->dst == RegTableCount[4]) - { - if (pMystart->src == 0) - fprintf(outfp,"xor edx,edx\n"); - else - fprintf(outfp,"mov edx,%llu\n",pMystart->src); - } - /* esp */ - else if (pMystart->dst == RegTableCount[1]) - { - if (pMystart->src == 0) - fprintf(outfp,"xor esp,esp\n"); - else - fprintf(outfp,"mov esp,%llu\n",pMystart->src); - } - /* ecx */ - else if (pMystart->dst == RegTableCount[8]) - { - if (pMystart->src == 0) - fprintf(outfp,"xor ecx,ecx\n"); - else - fprintf(outfp,"mov ecx,%llu\n",pMystart->src); - } - /* ebx */ - else if (pMystart->dst == RegTableCount[9]) - { - if (pMystart->src == 0) - fprintf(outfp,"xor ebx,ebx\n"); - else - fprintf(outfp,"mov ebx,%llu\n",pMystart->src); - } - /* esi */ - else if (pMystart->dst == RegTableCount[10]) - { - if (pMystart->src == 0) - fprintf(outfp,"xor esi,esi\n"); - else - fprintf(outfp,"mov esi,%llu\n",pMystart->src); - } - /* edi */ - else if (pMystart->dst == RegTableCount[10]) - { - if (pMystart->src == 0) - fprintf(outfp,"xor edi,edi\n"); - else - fprintf(outfp,"mov edi,%llu\n",pMystart->src); + /* small optimze */ + fprintf(outfp,"xor "); + standardreg( RegTableCount, + pMystart->dst, + setup_ebp, outfp); + fprintf(outfp,","); + standardreg( RegTableCount, + pMystart->dst, + setup_ebp, outfp); + fprintf(outfp,"\n"); } else { - if (setup_ebp == 1) - fprintf(outfp,"mov dword [ebx - %d], %llu\n", tmp, pMystart->src); - else - { - fprintf(outfp,"unsuported optimze should not happen it happen :(\n"); - } + fprintf(outfp,"mov "); + standardreg( RegTableCount, + pMystart->dst, + setup_ebp, outfp); + fprintf(outfp,",%llu\n",pMystart->src); } + } /* end "source are imm" */ + } /* end pMyBrainAnalys->type & 8 */ + + if ((pMystart->type & 64)== 64) + { + if ((pMystart->type & 2)== 2) + { + /* dest [eax - 0x20], source reg */ + + fprintf(outfp,"mov ["); + standardreg( RegTableCount, + pMystart->dst, + setup_ebp, outfp); + fprintf(outfp," %d], ",pMystart->dst_extra); + standardreg( RegTableCount, + pMystart->src, + setup_ebp, outfp); + fprintf(outfp,"\n"); } - - if ((pMystart->type & 32)== 32) - { - /* source are [reg - xx] */ - if (setup_ebp == 1) - fprintf(outfp,"not supporet\n"); - else - { - fprintf(outfp,"not supporet\n"); - fprintf(outfp,"mov eax, word[eax%d]\n",pMystart->src_extra); - } - - } - } /* end pMyBrainAnalys->type & 8 */ + } + + + + } /* return */ Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/CpuToI… ============================================================================== --- trunk/rosapps/devutils/cputointel/CpuToIntel.c (original) +++ trunk/rosapps/devutils/cputointel/CpuToIntel.c Fri Jan 19 00:35:48 2007 @@ -95,7 +95,7 @@ //} //return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type, mode); - return LoadPFileImage("e:\\testppc.exe","e:\\cputointel.asm",0,0,0,2); // disambler + return LoadPFileImage("e:\\testppc.exe","e:\\cputointel.asm",0,0,0,1); // disambler // return LoadPFileImage("e:\\testms.exe","e:\\cputointel.asm",0,0,0,1); // convert } Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c Fri Jan 19 00:35:48 2007 @@ -116,5 +116,6 @@ } } +// return 0; // hack getting dismabler working or converting working return retcode; } Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Fri Jan 19 00:35:48 2007 @@ -98,6 +98,8 @@ CPU_INT PPC_Stwu( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { + /* r1 store at -0x20(r1) */ + CPU_UNINT opcode; CPU_SHORT tmp = 0; @@ -114,12 +116,12 @@ tmp = _byteswap_ushort( ((CPU_SHORT)((opcode >> 16) & 0xffff))); pMyBrainAnalys->op = OP_ANY_mov; - pMyBrainAnalys->type= 2 + 8 + 32; /* 2 src reg 8 dst reg, 32 neg */ - pMyBrainAnalys->src_size = 16; - pMyBrainAnalys->dst_size = 16; + pMyBrainAnalys->type= 2 + 64; + pMyBrainAnalys->src_size = 32; + pMyBrainAnalys->dst_size = 32; pMyBrainAnalys->src = PPC_GetBitArrayBto31xx(opcode); pMyBrainAnalys->dst = PPC_GetBitArrayDstReg(opcode); - pMyBrainAnalys-> src_extra = tmp; + pMyBrainAnalys-> dst_extra = tmp; pMyBrainAnalys->memAdr=BaseAddress; return 4; Modified: trunk/rosapps/devutils/cputointel/any_op.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/any_op… ============================================================================== --- trunk/rosapps/devutils/cputointel/any_op.h (original) +++ trunk/rosapps/devutils/cputointel/any_op.h Fri Jan 19 00:35:48 2007 @@ -32,6 +32,7 @@ /* 4 = dest are memmory, 8 dest are register */ /* 16 = source are imm */ /* 32 = soucre -xx(r1) or [eax-xx] */ + /* 64 = dest -xx(r1) or [eax-xx] */ CPU_INT src_size; /* who many bits are src not vaild for reg*/ CPU_INT dst_size; /* who many bits are dst not vaild for reg*/ @@ -40,6 +41,7 @@ CPU_UNINT64 dst; CPU_INT src_extra; /* if type == 32 are set */ + CPU_INT dst_extra; /* if type == 32 are set */ CPU_UNINT memAdr; /* where are we in the current memory pos + baseaddress */

17 years, 11 months

[weiden] 25516: Merge 3 STATICs together

by weiden＠svn.reactos.org

Author: weiden Date: Fri Jan 19 00:09:56 2007 New Revision: 25516 URL: http://svn.reactos.org/svn/reactos?rev=25516&view=rev Log: Merge 3 STATICs together Modified: trunk/reactos/dll/cpl/sysdm/de.rc trunk/reactos/dll/cpl/sysdm/en.rc 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 00:09:56 2007 @@ -157,9 +157,7 @@ PUSHBUTTON "Löschen", IDC_USERPROFILE_DELETE, 134, 156, 56, 13 PUSHBUTTON "Kopieren nach", IDC_USERPROFILE_COPY, 194, 156, 56, 13 - LTEXT "Um neue Benutzerprofile zu erstellen, öffnen Sie ", IDC_STATIC, 7, 175, 162, 8 - CONTROL "<A>Benutzerkonten</A>", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 167, 175, 56, 8 - LTEXT "in der Systemsteuerung.", IDC_STATIC, 8, 185, 101, 8 + CONTROL "Um neue Benutzerprofile zu erstellen, öffnen Sie <A>Benutzerkonten</A> in der Systemsteuerung.", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 319, 8 DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13 PUSHBUTTON "Abbrechen", IDCANCEL, 196, 200, 54, 13 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 00:09:56 2007 @@ -148,9 +148,7 @@ PUSHBUTTON "Delete", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 PUSHBUTTON "Copy To", IDC_USERPROFILE_COPY, 200, 156, 50, 13 - LTEXT "To create new user accounts, open ", IDC_STATIC, 7, 175, 116, 8 - CONTROL "<A>User Accounts</A>", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 123, 175, 48, 8 - LTEXT "in Control Panel.", IDC_STATIC, 173, 175, 64, 8 + CONTROL "To create new user accounts, open <A>User Accounts</A> in Control Panel.", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 228, 8 DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13 PUSHBUTTON "Cancel", IDCANCEL, 196, 200, 54, 13

17 years, 11 months

[janderwald] 25515: - dutch translation by Eric Janssen (janssuhhh@gmail.com) See issue #1989 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jan 18 23:22:56 2007 New Revision: 25515 URL: http://svn.reactos.org/svn/reactos?rev=25515&view=rev Log: - dutch translation by Eric Janssen (janssuhhh(a)gmail.com) See issue #1989 for more details. Added: trunk/reactos/base/system/rundll32/lang/nl-NL.rc (with props) Modified: trunk/reactos/base/system/rundll32/rsrc.rc Added: trunk/reactos/base/system/rundll32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/nl-NL.rc (added) +++ trunk/reactos/base/system/rundll32/lang/nl-NL.rc Thu Jan 18 23:22:56 2007 @@ -1,0 +1,13 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + * Translation done by Vertaald door Eric Janssen + */ + +LANGUAGE LANG_DUTCH, SUBLANG_DUTCH +STRINGTABLE DISCARDABLE +{ +IDS_DllNotLoaded, "LoadLibrary kon '%s' niet laden" +IDS_MissingEntry, "Entry point:%s\n niet gevonden In %s" +} Propchange: trunk/reactos/base/system/rundll32/lang/nl-NL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rsrc.… ============================================================================== --- trunk/reactos/base/system/rundll32/rsrc.rc (original) +++ trunk/reactos/base/system/rundll32/rsrc.rc Thu Jan 18 23:22:56 2007 @@ -11,4 +11,5 @@ #include "lang/ru-RU.rc" #include "lang/el-GR.rc" #include "lang/nb-NO.rc" +#include "lang/nl-NL.rc" #include "lang/uk-UA.rc"

17 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2007