Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 41960: - Update Russian resources - Patch by tower
by gedmurphy＠svn.reactos.org 14 Jul '09

14 Jul '09

Author: gedmurphy Date: Tue Jul 14 22:32:31 2009 New Revision: 41960 URL: http://svn.reactos.org/svn/reactos?rev=41960&view=rev Log: - Update Russian resources - Patch by tower Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Tue Jul 14 22:32:31 2009 @@ -1,4 +1,4 @@ -// Russian language resource file (Lentin, 2007-06-10) +// Russian language resource file (Lentin, 2007-06-10 tower 2009 jul 14) LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -6,6 +6,9 @@ BEGIN POPUP "" BEGIN + MENUITEM SEPARATOR + MENUITEM "Ïàíåëü çàäà÷", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM SEPARATOR MENUITEM "&Çàêðåïèòü ïàíåëü çàäà÷", ID_LOCKTASKBAR MENUITEM "&Ñâîéñòâà", ID_SHELL_CMD_PROPERTIES END @@ -52,6 +55,67 @@ END END + +IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ïàíåëü Çàäà÷" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Ñâîéñòâà ïàíåëè çàäà÷", IDC_STATIC, 6,6,240,121, WS_DISABLED + CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21, WS_DISABLED + AUTOCHECKBOX "&Çàêðåïèòü ïàíåëü çàäà÷", IDC_TASKBARPROP_LOCK, 13,45,200,10, WS_DISABLED + AUTOCHECKBOX "À&âòîìàòè÷åñêè ñêðûâàòü ïàíåëü çàäà÷", IDC_TASKBARPROP_HIDE, 13,58,200,10, WS_DISABLED + AUTOCHECKBOX "&Ïîâåðõ äðóãèõ îêîí", IDC_TASKBARPROP_ONTOP, 13,71,200,10, WS_DISABLED + AUTOCHECKBOX "&Ãðóïïèðîâàòü ñõîæèå êíîïêè", IDC_TASKBARPROP_GROUP, 13,84,200,10, WS_DISABLED + AUTOCHECKBOX "Îòîáðàæàòü &Áûñòðûé çàïóñê", IDC_TASKBARPROP_SHOWQL, 13,97,200,10, WS_DISABLED + AUTOCHECKBOX "&Îòîáðàæàòü ïðåäâàðèòåëüíûé ïðîñìîòð îêîí", IDC_TASKBARPROP_WNDPREV, 13,110,200,10, WS_DISABLED +END + +IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ìåíþ Ïóñê" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + AUTORADIOBUTTON "&Ìåíþ ïóñê", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 + LTEXT "Ýòî ìåíþ ïðåäîñòàâëÿåò óäîáíûé äîñòóï ê èçáðàííûì ïðîðãðàììàì, ïàïêàì è ïîèñêó,.", IDC_STATIC, 20,17,150,24, WS_DISABLED + PUSHBUTTON "&Íàñòðîèòü...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED + AUTORADIOBUTTON "Êëàññè÷åññêîå &ìåíþ Ïóñê", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED + LTEXT "Êëàññè÷åññêèé ñòèëü îòîáðàæåíèÿ ìåíþ Ïóñê",-1,20,57,150,24, WS_DISABLED + PUSHBUTTON "&Íàñòðîèòü...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED + GROUPBOX "Ïåðñîíàëèçàöèÿ",IDC_STATIC, 7,100,238,42 + AUTOCHECKBOX "Ñîçäàâàòü è îòîáðàæàòü ëèñò ÷àñòî èñïîëüçóåìûõ &ôàéëîâ", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED + AUTOCHECKBOX "Îòîáðàæàòü ñïèñîê ÷àñòî èñïîëüçóåìûõ &ïðîãðàìì",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED +END + +IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Îáëàñòü îïîâåùåíèé" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED + GROUPBOX "Èêîíêè", IDC_STATIC, 6,33,240,58, WS_DISABLED + LTEXT "Îáëàñòü îïîâåùåíèÿ ìîæåò ñêðûâàòü èêîíêè ðåäêî èñïîëüçóåìûõ ïðîãðàìì.", IDC_STATIC, 13,48,223,16, WS_DISABLED + AUTOCHECKBOX "&Ñêðûâàòü ïàññèâíûå èêîíêè", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED + PUSHBUTTON "&Íàñòðîèòü...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED + GROUPBOX "Ñèñòåìíûå èêîíêè", IDC_STATIC, 6,97,240,84, WS_DISABLED + LTEXT "Âûáåðèòå èêîíêè îòîáðàæàåìûå âñåãäà.", IDC_STATIC, 13,112,223,16, WS_DISABLED + AUTOCHECKBOX "×àñ&û", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED + AUTOCHECKBOX "&Ãðîìêîñòü", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED + AUTOCHECKBOX "&Ñåòü", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED + AUTOCHECKBOX "&Ïèòàíèå", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED + +END + +IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Èíñòðóìåíòû" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + LTEXT "Âûáåðèòå èíñòðóìåíòû äëÿ äîáàâëåíèÿ â ïàíåëü çàäà÷.", IDC_STATIC, 7,7,223,12, WS_DISABLED + CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE +END + + STRINGTABLE DISCARDABLE BEGIN IDS_START "Ïóñê" @@ -59,3 +123,8 @@ IDS_OPEN_ALL_USERS "&Âñå ïîëüçîâàòåëè" IDS_EXPLORE_ALL_USERS "&Îáçîð Âñåõ ïîëüçîâàòåëåé" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TASKBAR_STARTMENU_PROP_CAPTION "Ñâîéñòâà ìåíþ Ïóñê è Ïàíåëè çàäà÷" +END

1 0

[cgutman] 41958: - Fix build
by cgutman＠svn.reactos.org 14 Jul '09

14 Jul '09

Author: cgutman Date: Tue Jul 14 21:55:41 2009 New Revision: 41958 URL: http://svn.reactos.org/svn/reactos?rev=41958&view=rev Log: - Fix build Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpcsv… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c [iso-8859-1] Tue Jul 14 21:55:41 2009 @@ -36,7 +36,7 @@ Req.Type = DhcpReqQueryHWInfo; Req.AdapterIndex = AdapterIndex; - Result = CallNamedPipe + Result = CallNamedPipeW ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), &BytesRead, DHCP_TIMEOUT ); @@ -58,7 +58,7 @@ Req.Type = DhcpReqLeaseIpAddress; Req.AdapterIndex = AdapterIndex; - Result = CallNamedPipe + Result = CallNamedPipeW ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), &BytesRead, DHCP_TIMEOUT ); @@ -74,7 +74,7 @@ Req.Type = DhcpReqReleaseIpAddress; Req.AdapterIndex = AdapterIndex; - Result = CallNamedPipe + Result = CallNamedPipeW ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), &BytesRead, DHCP_TIMEOUT ); @@ -90,7 +90,7 @@ Req.Type = DhcpReqRenewIpAddress; Req.AdapterIndex = AdapterIndex; - Result = CallNamedPipe + Result = CallNamedPipeW ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), &BytesRead, DHCP_TIMEOUT ); @@ -110,7 +110,7 @@ Req.Body.StaticRefreshParams.IPAddress = Address; Req.Body.StaticRefreshParams.Netmask = Netmask; - Result = CallNamedPipe + Result = CallNamedPipeW ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), &BytesRead, DHCP_TIMEOUT ); @@ -195,7 +195,7 @@ Req.Type = DhcpReqGetAdapterInfo; Req.AdapterIndex = AdapterIndex; - Result = CallNamedPipe + Result = CallNamedPipeW ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), &BytesRead, DHCP_TIMEOUT );

1 0

[jimtabor] 41957: - Remove HWND_MESSAGE patch.
by jimtabor＠svn.reactos.org 14 Jul '09

14 Jul '09

Author: jimtabor Date: Tue Jul 14 21:49:48 2009 New Revision: 41957 URL: http://svn.reactos.org/svn/reactos?rev=41957&view=rev Log: - Remove HWND_MESSAGE patch. Modified: trunk/reactos/subsystems/win32/win32k/include/class.h Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Tue Jul 14 21:49:48 2009 @@ -78,18 +78,6 @@ OUT PWINDOWCLASS *BaseClass OPTIONAL, OUT PWINDOWCLASS **Link OPTIONAL); -#define REGISTERCLASS_SYSTEM 0x4 - -PWINDOWCLASS -FASTCALL -IntCreateClass(IN CONST WNDCLASSEXW* lpwcx, - IN PUNICODE_STRING ClassName, - IN PUNICODE_STRING MenuName, - IN WNDPROC wpExtra, - IN DWORD dwFlags, - IN PDESKTOP Desktop, - IN PPROCESSINFO pi); - PCALLPROC UserFindCallProc(IN PWINDOWCLASS Class, IN WNDPROC WndProc,

1 0

[cgutman] 41959: - Release all adapter IP addresses when using /release
by cgutman＠svn.reactos.org 14 Jul '09

14 Jul '09

Author: cgutman Date: Tue Jul 14 22:14:32 2009 New Revision: 41959 URL: http://svn.reactos.org/svn/reactos?rev=41959&view=rev Log: - Release all adapter IP addresses when using /release Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] Tue Jul 14 22:14:32 2009 @@ -515,6 +515,7 @@ { IP_ADAPTER_INDEX_MAP AdapterInfo; DWORD ret; + DWORD i; /* if interface is not given, query GetInterfaceInfo */ if (Index == NULL) @@ -530,8 +531,19 @@ if (GetInterfaceInfo(pInfo, &ulOutBufLen) == NO_ERROR ) { - CopyMemory(&AdapterInfo, &pInfo->Adapter[0], sizeof(IP_ADAPTER_INDEX_MAP)); - _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name); + for (i = 0; i < pInfo->NumAdapters; i++) + { + CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); + _tprintf(_T("name - %S\n"), pInfo->Adapter[i].Name); + + /* Call IpReleaseAddress to release the IP address on the specified adapter. */ + if ((ret = IpReleaseAddress(&AdapterInfo)) != NO_ERROR) + { + _tprintf(_T("\nAn error occured while releasing interface %S : \n"), AdapterInfo.Name); + DoFormatMessage(ret); + } + } + HeapFree(ProcessHeap, 0, pInfo); } else @@ -556,15 +568,6 @@ * ipconfig /release *con* will release all cards with 'con' in their name */ } - - - /* Call IpReleaseAddress to release the IP address on the specified adapter. */ - if ((ret = IpReleaseAddress(&AdapterInfo)) != NO_ERROR) - { - _tprintf(_T("\nAn error occured while releasing interface %S : \n"), AdapterInfo.Name); - DoFormatMessage(ret); - } - }

1 0

[jimtabor] 41956: - Update Xp w32process structure with real names, based on W7U symbols. Ref: http://www.reactos.org/wiki/index.php/Techwiki/win32k/W32PROCESS
by jimtabor＠svn.reactos.org 14 Jul '09

14 Jul '09

Author: jimtabor Date: Tue Jul 14 21:48:23 2009 New Revision: 41956 URL: http://svn.reactos.org/svn/reactos?rev=41956&view=rev Log: - Update Xp w32process structure with real names, based on W7U symbols. Ref: http://www.reactos.org/wiki/index.php/Techwiki/win32k/W32PROCESS Modified: trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/include/win32.h Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Tue Jul 14 21:48:23 2009 @@ -78,6 +78,18 @@ OUT PWINDOWCLASS *BaseClass OPTIONAL, OUT PWINDOWCLASS **Link OPTIONAL); +#define REGISTERCLASS_SYSTEM 0x4 + +PWINDOWCLASS +FASTCALL +IntCreateClass(IN CONST WNDCLASSEXW* lpwcx, + IN PUNICODE_STRING ClassName, + IN PUNICODE_STRING MenuName, + IN WNDPROC wpExtra, + IN DWORD dwFlags, + IN PDESKTOP Desktop, + IN PPROCESSINFO pi); + PCALLPROC UserFindCallProc(IN PWINDOWCLASS Class, IN WNDPROC WndProc, Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Tue Jul 14 21:48:23 2009 @@ -75,17 +75,17 @@ ULONG W32PF_flags; PKEVENT InputIdleEvent; DWORD StartCursorHideTime; - DWORD NextStart; + struct _W32PROCESS * NextStart; PVOID pDCAttrList; PVOID pBrushAttrList; DWORD W32Pid; LONG GDIHandleCount; LONG UserHandleCount; - DWORD cSimpleLock; /* Locking Process during access to structure. */ - RTL_AVL_TABLE rtlAvlTable; /* Process AVL Table. */ - LIST_ENTRY leDCAttrList; - LIST_ENTRY leObjAttrList; -/* ReactOS */ + PEX_PUSH_LOCK GDIPushLock; /* Locking Process during access to structure. */ + RTL_AVL_TABLE GDIEngUserMemAllocTable; /* Process AVL Table. */ + LIST_ENTRY GDIDcAttrFreeList; + LIST_ENTRY GDIBrushAttrFreeList; +/* ReactOS, will move to PROCESSINFO */ LIST_ENTRY ClassList; LIST_ENTRY MenuListHead; FAST_MUTEX PrivateFontListLock;

1 0

[cgutman] 41955: - Renew the IP address of all adapters when using /renew - Leave the critical section in failure case - Check for NULL adapter (CID 499) - Implement IpRenewAddress and IpReleaseAddress - Fixes ipconfig /release and ipconfig /renew
by cgutman＠svn.reactos.org 14 Jul '09

14 Jul '09

Author: cgutman Date: Tue Jul 14 21:43:57 2009 New Revision: 41955 URL: http://svn.reactos.org/svn/reactos?rev=41955&view=rev Log: - Renew the IP address of all adapters when using /renew - Leave the critical section in failure case - Check for NULL adapter (CID 499) - Implement IpRenewAddress and IpReleaseAddress - Fixes ipconfig /release and ipconfig /renew Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c trunk/reactos/base/services/dhcp/api.c trunk/reactos/base/services/dhcp/pipe.c trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/include/reactos/libs/dhcp/rosdhcp_public.h Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] Tue Jul 14 21:43:57 2009 @@ -573,6 +573,7 @@ VOID Renew(LPTSTR Index) { IP_ADAPTER_INDEX_MAP AdapterInfo; + DWORD i; /* if interface is not given, query GetInterfaceInfo */ if (Index == NULL) @@ -603,8 +604,19 @@ /* Make a second call to GetInterfaceInfo to get the actual data we want */ if (GetInterfaceInfo(pInfo, &ulOutBufLen) == NO_ERROR ) { - CopyMemory(&AdapterInfo, &pInfo->Adapter[0], sizeof(IP_ADAPTER_INDEX_MAP)); - _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name); + for (i = 0; i < pInfo->NumAdapters; i++) + { + CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); + _tprintf(_T("name - %S\n"), pInfo->Adapter[i].Name); + + + /* Call IpRenewAddress to renew the IP address on the specified adapter. */ + if (IpRenewAddress(&AdapterInfo) != NO_ERROR) + { + _tprintf(_T("\nAn error occured while renew interface %s : "), _T("*name*")); + DoFormatMessage(0); + } + } } else { @@ -622,14 +634,6 @@ * i.e. ipconfig /renew Eth* will renew all cards starting with Eth... * ipconfig /renew *con* will renew all cards with 'con' in their name */ - } - - - /* Call IpRenewAddress to renew the IP address on the specified adapter. */ - if (IpRenewAddress(&AdapterInfo) != NO_ERROR) - { - _tprintf(_T("\nAn error occured while renew interface %s : "), _T("*name*")); - DoFormatMessage(0); } } Modified: trunk/reactos/base/services/dhcp/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/api.c?r… ============================================================================== --- trunk/reactos/base/services/dhcp/api.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/api.c [iso-8859-1] Tue Jul 14 21:43:57 2009 @@ -61,10 +61,14 @@ Adapter = AdapterFindIndex( Req->AdapterIndex ); - Reply.QueryHWInfo.AdapterIndex = Req->AdapterIndex; - Reply.QueryHWInfo.MediaType = Adapter->IfMib.dwType; - Reply.QueryHWInfo.Mtu = Adapter->IfMib.dwMtu; - Reply.QueryHWInfo.Speed = Adapter->IfMib.dwSpeed; + Reply.Reply = Adapter ? 1 : 0; + + if (Adapter) { + Reply.QueryHWInfo.AdapterIndex = Req->AdapterIndex; + Reply.QueryHWInfo.MediaType = Adapter->IfMib.dwType; + Reply.QueryHWInfo.Mtu = Adapter->IfMib.dwMtu; + Reply.QueryHWInfo.Speed = Adapter->IfMib.dwSpeed; + } ApiUnlock(); @@ -99,14 +103,13 @@ Adapter = AdapterFindIndex( Req->AdapterIndex ); - Reply.Reply = Adapter ? 1 : 0; - if( !Adapter || Adapter->DhclientState.state != S_BOUND ) { Reply.Reply = 0; + ApiUnlock(); return Send( &Reply ); } - Adapter->DhclientState.state = S_BOUND; + Reply.Reply = 1; send_discover( &Adapter->DhclientInfo ); state_bound( &Adapter->DhclientInfo ); Modified: trunk/reactos/base/services/dhcp/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/pipe.c?… ============================================================================== --- trunk/reactos/base/services/dhcp/pipe.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/pipe.c [iso-8859-1] Tue Jul 14 21:43:57 2009 @@ -89,7 +89,7 @@ } HANDLE PipeInit() { - CommPipe = CreateNamedPipe + CommPipe = CreateNamedPipeW ( DHCP_PIPE_NAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] Tue Jul 14 21:43:57 2009 @@ -2,6 +2,7 @@ <importlibrary definition="iphlpapi.spec" /> <include base="iphlpapi">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="dhcp">include</include> <library>wine</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Tue Jul 14 21:43:57 2009 @@ -48,6 +48,8 @@ #include "resinfo.h" #include "route.h" #include "wine/debug.h" +#include "dhcpcsdk.h" +#include "dhcp/rosdhcp_public.h" WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); @@ -1880,19 +1882,33 @@ * Success: NO_ERROR * Failure: error code from winerror.h * - * NOTES - * Since GetAdaptersInfo never returns adapters that have DHCP enabled, - * this function does nothing. - * - * FIXME - * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI IpReleaseAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) { + COMM_DHCP_REPLY Reply; + COMM_DHCP_REQ Request; + DWORD BytesRead; + + Request.AdapterIndex = AdapterInfo->Index; + Request.Type = DhcpReqReleaseIpAddress; + TRACE("AdapterInfo %p\n", AdapterInfo); - /* not a stub, never going to support this (and I never mark an adapter as - DHCP enabled, see GetAdaptersInfo, so this should never get called) */ - return ERROR_NOT_SUPPORTED; + + if (CallNamedPipe(DHCP_PIPE_NAME, + &Request, + sizeof(Request), + &Reply, + sizeof(Reply), + &BytesRead, + NMPWAIT_USE_DEFAULT_WAIT)) + { + if (Reply.Reply) + return NO_ERROR; + + return ERROR_INVALID_PARAMETER; + } + + return ERROR_PROC_NOT_FOUND; } @@ -1907,20 +1923,33 @@ * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h - * - * NOTES - * Since GetAdaptersInfo never returns adapters that have DHCP enabled, - * this function does nothing. - * - * FIXME - * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI IpRenewAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) { + COMM_DHCP_REPLY Reply; + COMM_DHCP_REQ Request; + DWORD BytesRead; + + Request.AdapterIndex = AdapterInfo->Index; + Request.Type = DhcpReqRenewIpAddress; + TRACE("AdapterInfo %p\n", AdapterInfo); - /* not a stub, never going to support this (and I never mark an adapter as - DHCP enabled, see GetAdaptersInfo, so this should never get called) */ - return ERROR_NOT_SUPPORTED; + + if (CallNamedPipe(DHCP_PIPE_NAME, + &Request, + sizeof(Request), + &Reply, + sizeof(Reply), + &BytesRead, + NMPWAIT_USE_DEFAULT_WAIT)) + { + if (Reply.Reply) + return NO_ERROR; + + return ERROR_INVALID_PARAMETER; + } + + return ERROR_PROC_NOT_FOUND; } Modified: trunk/reactos/include/reactos/libs/dhcp/rosdhcp_public.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/dhcp/… ============================================================================== --- trunk/reactos/include/reactos/libs/dhcp/rosdhcp_public.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/dhcp/rosdhcp_public.h [iso-8859-1] Tue Jul 14 21:43:57 2009 @@ -48,6 +48,6 @@ } GetAdapterInfo; } COMM_DHCP_REPLY; -#define DHCP_PIPE_NAME "\\\\.\\pipe\\dhcpclient" +#define DHCP_PIPE_NAME L"\\\\.\\pipe\\dhcpclient" #endif/*ROSDHCP_PUBLIC_H*/

1 0

[sginsberg] 41954: - Don't use KfRaiseIrql in portable code
by sginsberg＠svn.reactos.org 14 Jul '09

14 Jul '09

Author: sginsberg Date: Tue Jul 14 20:47:15 2009 New Revision: 41954 URL: http://svn.reactos.org/svn/reactos?rev=41954&view=rev Log: - Don't use KfRaiseIrql in portable code Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Tue Jul 14 20:47:15 2009 @@ -729,7 +729,7 @@ PCHAR State = "????", Consumer = "Unknown"; KIRQL OldIrql; - OldIrql = KfRaiseIrql(HIGH_LEVEL); + KeRaiseIrql(HIGH_LEVEL, &OldIrql); // // Loop the PFN database

1 0

[dreimer] 41953: Made the updater Useable again with Colin's Spring Cleanup. Fixed a typo in the PS Version First Update for RosBE64 1.1 Support is available now.
by dreimer＠svn.reactos.org 14 Jul '09

14 Jul '09

Author: dreimer Date: Tue Jul 14 19:05:03 2009 New Revision: 41953 URL: http://svn.reactos.org/svn/reactos?rev=41953&view=rev Log: Made the updater Useable again with Colin's Spring Cleanup. Fixed a typo in the PS Version First Update for RosBE64 1.1 Support is available now. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Tue Jul 14 19:05:03 2009 @@ -20,8 +20,7 @@ if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { return - } - if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { + } else { get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt $PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt } if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { @@ -31,7 +30,7 @@ $YESNO = Read-Host "(yes), (no)" if (($YESNO -eq "yes") -or ($YESNO -eq "y")) { if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z")) { - get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt $PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt + get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z $PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z } if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z") { remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT\*.*" -force -EA SilentlyContinue Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Tue Jul 14 19:05:03 2009 @@ -57,15 +57,15 @@ call :UPDCHECK ) else if /i "%1" == "delete" ( set _ROSBE_STATCOUNT=%2 - del /F /Q "%APPDATA%\RosBE\Updates\%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.*" 1> NUL 2> NUL - del /F /Q "%APPDATA%\RosBE\Updates\tmp\%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.*" 1> NUL 2> NUL + del /F /Q "%APPDATA%\RosBE\Updates\%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.*" 1> NUL 2> NUL + del /F /Q "%APPDATA%\RosBE\Updates\tmp\%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.*" 1> NUL 2> NUL ) else if /i "%1" == "info" ( set _ROSBE_STATCOUNT=%2 cd tmp - if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL - if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( - type "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" + if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL + if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( + type "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ) else ( echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. goto :EOC @@ -92,16 +92,16 @@ :UPDCHECK cd /d "%APPDATA%\RosBE\Updates" -if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( +if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( goto :EOF ) -if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL +if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL ) -if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( - type "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" +if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( + type "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" echo. echo Install? set /p YESNO="(yes), (no)" @@ -109,14 +109,14 @@ if /i "!YESNO!"=="y" goto :updyes goto :no :updyes - if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z 1> NUL 2> NUL + if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z 1> NUL 2> NUL ) - if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" ( - del /F /Q "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%\*.*" 1>NUL 2>NUL - "%_ROSBE_BASEDIR%\Tools\7z.exe" x "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" - cd "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%" - call "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.cmd" + if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z" ( + del /F /Q "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!\*.*" 1>NUL 2>NUL + "%_ROSBE_BASEDIR%\Tools\7z.exe" x "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z" + cd "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!" + call "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.cmd" goto :EOF ) else ( echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. @@ -130,7 +130,7 @@ if /i "!YESNO!"=="y" goto :yesagain goto :EOF :yesagain - del "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" 1> NUL 2> NUL + del "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" 1> NUL 2> NUL goto :EOF ) ) else ( @@ -150,18 +150,18 @@ :WHILE2 if "!_ROSBE_STATCOUNT!" == "10" GOTO :OUT cd tmp - if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL - if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( - set _ROSBE_UPDATES=%_ROSBE_UPDATES% %_ROSBE_STATCOUNT% + if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL + if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( + set _ROSBE_UPDATES=!_ROSBE_UPDATES! !_ROSBE_STATCOUNT! ) ) cd.. set /a _ROSBE_STATCOUNT+=1 GOTO :WHILE2 -:OUT :EOC cd /d "%_ROSBE_OPATH%" title ReactOS Build Environment %_ROSBE_VERSION% -endlocal +:OUT +endlocal & set _ROSBE_UPDATES=%_ROSBE_UPDATES% & set _ROSBE_STATCOUNT=%_ROSBE_STATCOUNT%

1 0

[gedmurphy] 41952: - Update polish resources - Patch by Maciej Bialas (bjauy at o2 dot pl)
by gedmurphy＠svn.reactos.org 14 Jul '09

14 Jul '09

Author: gedmurphy Date: Tue Jul 14 17:02:23 2009 New Revision: 41952 URL: http://svn.reactos.org/svn/reactos?rev=41952&view=rev Log: - Update polish resources - Patch by Maciej Bialas (bjauy at o2 dot pl) Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] Tue Jul 14 17:02:23 2009 @@ -1,4 +1,5 @@ //Polish translation by Caemyr - Olaf Siejka (caemyr(a)gmail.com) June, 2007 +// updated by niski - Maciej Bialas (bjauy(a)o2.pl), July 2009 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -6,6 +7,9 @@ BEGIN POPUP "" BEGIN + MENUITEM SEPARATOR + MENUITEM "Mened¿er zadañ", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM SEPARATOR MENUITEM "&Zablokuj Pasek zadañ", ID_LOCKTASKBAR MENUITEM "&W³aciwoci", ID_SHELL_CMD_PROPERTIES END @@ -47,10 +51,71 @@ MENUITEM "S&ynchronizuj", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED MENUITEM "&Wyloguj %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED MENUITEM "&Roz³¹cz...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED - MENUITEM "Wydokuj &komputer", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "Oddokuj &komputer", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED MENUITEM "&Zamknij system...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED END END + + +IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Pasek zadañ" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Wygl¹d paska zadañ", IDC_STATIC, 6,6,240,121, WS_DISABLED + CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21, WS_DISABLED + AUTOCHECKBOX "&Zablokuj pasek zadañ", IDC_TASKBARPROP_LOCK, 13,45,200,10, WS_DISABLED + AUTOCHECKBOX "A&utomatyczne ukrywanie paska zadañ", IDC_TASKBARPROP_HIDE, 13,58,200,10, WS_DISABLED + AUTOCHECKBOX "Zawsze &na wierzchu", IDC_TASKBARPROP_ONTOP, 13,71,200,10, WS_DISABLED + AUTOCHECKBOX "&Grupuj programy w pasku zadañ", IDC_TASKBARPROP_GROUP, 13,84,200,10, WS_DISABLED + AUTOCHECKBOX "Poka¿ pasek &Szybkiego uruchamiania", IDC_TASKBARPROP_SHOWQL, 13,97,200,10, WS_DISABLED + AUTOCHECKBOX "&Poka¿ podgl¹d okien (miniaturki)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10, WS_DISABLED +END + +IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Menu Start" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + AUTORADIOBUTTON "&Menu Start", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 + LTEXT "Ten styl menu daje Tobie ³atwy dostêp do Twoich folderów, ulubionych programów i wyszukiwania.", IDC_STATIC, 20,17,150,24, WS_DISABLED + PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED + AUTORADIOBUTTON "&Klasyczne Menu Start", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED + LTEXT "Ten styl menu zawiera klasyczny wygl¹d i funkcjonalnoæ",-1,20,57,150,24, WS_DISABLED + PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED + GROUPBOX "Prywatnoæ",IDC_STATIC, 7,100,238,42 + AUTOCHECKBOX "Zachowaj i wywietl listê niedawno &otwartych plików", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED + AUTOCHECKBOX "Zachowaj i wywietl listê niedawno otwartych &programów",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED +END + +IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Obszar powiadomieñ" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED + GROUPBOX "Ikony", IDC_STATIC, 6,33,240,58, WS_DISABLED + LTEXT "Mo¿esz uporz¹dkowaæ obszar powiadomieñ poprzez ukrycie rzadko u¿ywanych ikon.", IDC_STATIC, 13,48,223,16, WS_DISABLED + AUTOCHECKBOX "&Ukryj nieaktywne ikony", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED + PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED + GROUPBOX "Ikony systemowe", IDC_STATIC, 6,97,240,84, WS_DISABLED + LTEXT "Wybierz zawsze widoczne ikony systemowe.", IDC_STATIC, 13,112,223,16, WS_DISABLED + AUTOCHECKBOX "&Zegar", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED + AUTOCHECKBOX "&G³onoæ", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED + AUTOCHECKBOX "&Sieæ", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED + AUTOCHECKBOX "Z&arz¹dzanie energi¹", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED + +END + +IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Paski narzêdzi" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + LTEXT "Wybierz paski narzêdzi, które chcesz dodaæ do paska zadañ.", IDC_STATIC, 7,7,223,12, WS_DISABLED + CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE +END + STRINGTABLE DISCARDABLE BEGIN @@ -59,3 +124,8 @@ IDS_OPEN_ALL_USERS "&Otwórz - wszyscy u¿ytkownicy" IDS_EXPLORE_ALL_USERS "&Eksploruj - wszyscy u¿ytkownicy" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TASKBAR_STARTMENU_PROP_CAPTION "W³aciwoci paska zadañ i Menu Start" +END

1 0

[dreimer] 41951: Bugz, They are everywhere. - Fix up the call of the i386 config file in charch. - Fix up default color of the 64 bit RosBE. - "Only" call the 64 bit config file when you are in 64 bit mode. - Fix the 64 bit options tool to be useable.
by dreimer＠svn.reactos.org 14 Jul '09

14 Jul '09

Author: dreimer Date: Tue Jul 14 13:29:23 2009 New Revision: 41951 URL: http://svn.reactos.org/svn/reactos?rev=41951&view=rev Log: Bugz, They are everywhere. - Fix up the call of the i386 config file in charch. - Fix up default color of the 64 bit RosBE. - "Only" call the 64 bit config file when you are in 64 bit mode. - Fix the 64 bit options tool to be useable. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/de-DE.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/en-US.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/es-ES.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/fr-FR.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/pl-PL.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ru-RU.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/uk-UA.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -11,9 +11,6 @@ $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # Set defaults to work with and override them if edited by the options utility. -(Get-Host).UI.RawUI.ForegroundColor = "Green" -(Get-Host).UI.RawUI.BackgroundColor = "Black" -clear-host # For NT4 compatibility if ($ENV:APPDATA.Length -lt 1) { @@ -27,6 +24,14 @@ } else { $ENV:ROS_ARCH = "$($args)" } +if ($ENV:ROS_ARCH -eq "amd64") { + (Get-Host).UI.RawUI.ForegroundColor = 0xB + (Get-Host).UI.RawUI.BackgroundColor = 0x0 +} else { + (Get-Host).UI.RawUI.ForegroundColor = 0xA + (Get-Host).UI.RawUI.BackgroundColor = 0x0 +} +clear-host $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) @@ -123,8 +128,10 @@ } # Load the user's options if any -if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { - & "$ENV:APPDATA\RosBE\rosbe-options.ps1" +if ($args[0] -eq $null) { + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { + & "$ENV:APPDATA\RosBE\rosbe-options.ps1" + } } if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$args.ps1") { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -22,8 +22,14 @@ $ENV:ROS_ARCH = $ARCH # Refresh all needed Params by recalling the main Path setting CMD File. -if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1") { - IEX "& '$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1'" +if ($ENV:ROS_ARCH -eq "i386") { + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { + IEX "& '$ENV:APPDATA\RosBE\rosbe-options.ps1'" + } +} else { + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1") { + IEX "& '$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1'" + } } chdefgcc $ENV:ROS_ARCH target Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -55,9 +55,14 @@ set CPLUS_INCLUDE_PATH= set LIBRARY_PATH= +if "%ROS_ARCH%" == "amd64" ( + color 0B +) :: Load the user's options if any -if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( - call "%APPDATA%\RosBE\rosbe-options.cmd" +if "%ROS_ARCH%" == "i386" ( + if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( + call "%APPDATA%\RosBE\rosbe-options.cmd" + ) ) if exist "%APPDATA%\RosBE\rosbe-options-%1.cmd" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -32,8 +32,14 @@ endlocal & set ROS_ARCH=%ARCH% :: Refresh all needed Params by recalling the main Path setting CMD File. -if exist "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" ( - call "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" +if "%ROS_ARCH%" == "i386" ( + if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( + call "%APPDATA%\RosBE\rosbe-options.cmd" + ) +) else ( + if exist "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" ( + call "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" + ) ) call "%_ROSBE_BASEDIR%\chdefgcc.cmd" %ROS_ARCH% target Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -16,7 +16,7 @@ :: Check if we're switching to the AMD64 architecture if "%ROS_ARCH%" == "amd64" ( - set ROS_PREFIX=x86_64-pc-mingw32 + set ROS_PREFIX=x86_64-w64-mingw32 ) else ( set ROS_PREFIX= ) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/de-DE.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -2,7 +2,7 @@ ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "RosBE x86-64 Einstellungen" +CAPTION "RosBE AMD64 Einstellungen" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Hintergrundfarbe", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/en-US.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/en-US.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -2,7 +2,7 @@ ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS x86-64 Build Environment Settings" +CAPTION "ReactOS AMD64 Build Environment Settings" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Background Color", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/es-ES.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -2,7 +2,7 @@ ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configuración de ReactOS x86-64 Build Environment" +CAPTION "Configuración de ReactOS AMD64 Build Environment" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Color de fondo", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/fr-FR.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -2,7 +2,7 @@ ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Paramètres de x86-64 l'Environnement de Compilation de ReactOS" +CAPTION "Paramètres de AMD64 l'Environnement de Compilation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Couleur d'arrière plan", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/pl-PL.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -2,7 +2,7 @@ ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ustawienia ReactOS x86-64 Build Environment" +CAPTION "Ustawienia ReactOS AMD64 Build Environment" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Kolor t³a", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ru-RU.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -4,7 +4,7 @@ ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ReactOS - x86-64" +CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ReactOS - AMD64" FONT 8,"MS Sans Serif",0,0 BEGIN LTEXT "Öâåò ôîíà", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/uk-UA.rc [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -10,7 +10,7 @@ ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS - x86-64" +CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS - AMD64" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Êîë³ð ôîíó", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -111,8 +111,8 @@ return FALSE; wcscpy(checkmgw, mingwpath); - if ((wcslen(checkmgw) + wcslen(L"\\bin\\gcc.exe")) < MAX_PATH) - wcscat(checkmgw, L"\\bin\\gcc.exe"); + if ((wcslen(checkmgw) + wcslen(L"\\bin\\x86_64-w64-mingw32-gcc.exe")) < MAX_PATH) + wcscat(checkmgw, L"\\bin\\x86_64-w64-mingw32-gcc.exe"); hFile = CreateFile(checkmgw, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h [iso-8859-1] Tue Jul 14 13:29:23 2009 @@ -14,7 +14,7 @@ #include <wchar.h> #include "resources.h" -#define MINGWVERSION L"\\x86_64" +#define MINGWVERSION L"\\amd64" typedef struct _SETTINGS {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs