Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[cgutman] 36700: - More work on NDIS 6.0 - Part 2 of X
by cgutman＠svn.reactos.org 08 Oct '08

08 Oct '08

Author: cgutman Date: Wed Oct 8 17:25:01 2008 New Revision: 36700 URL: http://svn.reactos.org/svn/reactos?rev=36700&view=rev Log: - More work on NDIS 6.0 - Part 2 of X Added: branches/aicom-network-fixes/drivers/network/ndis/ndis/workitem.c (with props) Added: branches/aicom-network-fixes/drivers/network/ndis/ndis/workitem.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/workitem.c (added) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/workitem.c [iso-8859-1] Wed Oct 8 17:25:01 2008 @@ -1,0 +1,43 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS library + * FILE: workitem.c + * PURPOSE: Implements the NDIS 6.0 work item interface + * PROGRAMMERS: Cameron Gutman (aicommander(a)gmail.com) + */ + +#include "ndissys.h" + +NDIS_HANDLE +EXPORT +NdisAllocateIoWorkItem( + IN NDIS_HANDLE NdisObjectHandle) +{ + PLOGICAL_ADAPTER Adapter = NdisObjectHandle; + + return IoAllocateWorkItem(Adapter->NdisMiniportBlock.PhysicalDeviceObject); +} + +VOID +EXPORT +NdisQueueIoWorkItem( + IN NDIS_HANDLE NdisIoWorkItemHandle, + IN NDIS_IO_WORKITEM_ROUTINE Routine, + IN PVOID WorkItemContext) +{ + PNDIS_IO_WORKITEM WorkItem = NdisIoWorkItemHandle; + + IoQueueWorkItem(WorkItem, + Routine, + CriticalWorkQueue, + WorkItemContext); +} + +VOID +EXPORT +NdisFreeIoWorkItem( + IN NDIS_HANDLE NdisIoWorkItemHandle) +{ + PNDIS_IO_WORKITEM WorkItem = NdisIoWorkItemHandle; + IoFreeWorkItem(WorkItem); +} Propchange: branches/aicom-network-fixes/drivers/network/ndis/ndis/workitem.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 36699: - Some of my work on NDIS 6.0 - Doesn't compile yet - Part 1 of X
by cgutman＠svn.reactos.org 08 Oct '08

08 Oct '08

Author: cgutman Date: Wed Oct 8 16:17:10 2008 New Revision: 36699 URL: http://svn.reactos.org/svn/reactos?rev=36699&view=rev Log: - Some of my work on NDIS 6.0 - Doesn't compile yet - Part 1 of X Added: branches/aicom-network-fixes/drivers/network/ndis/ndis/object.c (with props) Added: branches/aicom-network-fixes/drivers/network/ndis/ndis/object.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/object.c (added) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/object.c [iso-8859-1] Wed Oct 8 16:17:10 2008 @@ -1,0 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS library + * FILE: object.c + * PURPOSE: Implements the NDIS 6.0 object interface + * PROGRAMMERS: Cameron Gutman (aicommander(a)gmail.com) + */ + +#include "ndissys.h" + +PNDIS_GENERIC_OBJECT +EXPORT +NdisAllocateGenericObject( + IN PDRIVER_OBJECT DriverObject OPTIONAL, + IN ULONG Tag, + IN USHORT Size) +{ + PNDIS_GENERIC_OBJECT Object; + + Object = ExAllocatePoolWithTag(NonPagedPool, sizeof(NDIS_GENERIC_OBJECT) + Size, Tag); + if (!Object) return NULL; + + RtlZeroMemory(Object, sizeof(NDIS_GENERIC_OBJECT) + Size); + + Object->DriverObject = DriverObject; + Object->Header.Type = NDIS_OBJECT_TYPE_GENERIC_OBJECT; + Object->Header.Revision = NDIS_GENERIC_OBJECT_REVISION_1; + Object->Header.Size = sizeof(NDIS_GENERIC_OBJECT); + + return Object; +} + +VOID +EXPORT +NdisFreeGenericObject( + IN PNDIS_GENERIC_OBJECT NdisGenericObject) +{ + ExFreePool(NdisGenericObject); +} + Propchange: branches/aicom-network-fixes/drivers/network/ndis/ndis/object.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 36698: - Fix formatting (no code changed)
by dchapyshev＠svn.reactos.org 08 Oct '08

08 Oct '08

Author: dchapyshev Date: Wed Oct 8 11:26:50 2008 New Revision: 36698 URL: http://svn.reactos.org/svn/reactos?rev=36698&view=rev Log: - Fix formatting (no code changed) Modified: trunk/reactos/base/applications/cacls/cacls.c trunk/reactos/base/applications/cacls/resource.h trunk/reactos/base/applications/charmap/about.c trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/lrgcell.c trunk/reactos/base/applications/charmap/map.c trunk/reactos/base/applications/charmap/resource.h trunk/reactos/base/applications/control/control.c trunk/reactos/base/applications/regedt32/regedt32.c Modified: trunk/reactos/base/applications/cacls/cacls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/ca… ============================================================================== --- trunk/reactos/base/applications/cacls/cacls.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/cacls.c [iso-8859-1] Wed Oct 8 11:26:50 2008 @@ -28,7 +28,8 @@ }; -static INT +static +INT LengthOfStrResource(IN HINSTANCE hInst, IN UINT uID) { @@ -72,7 +73,8 @@ } -static INT +static +INT AllocAndLoadString(OUT LPTSTR *lpTarget, IN HINSTANCE hInst, IN UINT uID) @@ -106,7 +108,8 @@ } -static VOID +static +VOID PrintHelp(VOID) { LPTSTR szHelp; @@ -125,7 +128,8 @@ } -static VOID +static +VOID PrintErrorMessage(IN DWORD dwError) { LPTSTR szError; @@ -148,7 +152,8 @@ } -static DWORD +static +DWORD LoadAndPrintString(IN HINSTANCE hInst, IN UINT uID) { @@ -170,7 +175,8 @@ } -static BOOL +static +BOOL PrintFileDacl(IN LPTSTR FilePath, IN LPTSTR FileName) { @@ -507,7 +513,9 @@ } -int __cdecl _tmain(int argc, const TCHAR *argv[]) +int +__cdecl +_tmain(int argc, const TCHAR *argv[]) { if (argc < 2) { Modified: trunk/reactos/base/applications/cacls/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/re… ============================================================================== --- trunk/reactos/base/applications/cacls/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/resource.h [iso-8859-1] Wed Oct 8 11:26:50 2008 @@ -1,44 +1,44 @@ #ifndef _CACLS_RESOURCE_H #define _CACLS_RESOURCE_H -#define IDS_HELP 101 -#define IDS_ABBR_CI 102 -#define IDS_ABBR_OI 103 -#define IDS_ABBR_IO 104 -#define IDS_ABBR_FULL 105 -#define IDS_ABBR_READ 106 -#define IDS_ABBR_WRITE 107 -#define IDS_ABBR_CHANGE 108 -#define IDS_ABBR_NONE 109 -#define IDS_ALLOW 110 -#define IDS_DENY 111 -#define IDS_SPECIAL_ACCESS 112 +#define IDS_HELP 101 +#define IDS_ABBR_CI 102 +#define IDS_ABBR_OI 103 +#define IDS_ABBR_IO 104 +#define IDS_ABBR_FULL 105 +#define IDS_ABBR_READ 106 +#define IDS_ABBR_WRITE 107 +#define IDS_ABBR_CHANGE 108 +#define IDS_ABBR_NONE 109 +#define IDS_ALLOW 110 +#define IDS_DENY 111 +#define IDS_SPECIAL_ACCESS 112 -#define IDS_GENERIC_READ 113 -#define IDS_GENERIC_WRITE 114 -#define IDS_GENERIC_EXECUTE 115 -#define IDS_GENERIC_ALL 116 -#define IDS_FILE_GENERIC_EXECUTE 118 -#define IDS_FILE_GENERIC_READ 119 -#define IDS_FILE_GENERIC_WRITE 120 -#define IDS_FILE_READ_DATA 121 -#define IDS_FILE_WRITE_DATA 122 -#define IDS_FILE_APPEND_DATA 123 -#define IDS_FILE_READ_EA 124 -#define IDS_FILE_WRITE_EA 125 -#define IDS_FILE_EXECUTE 126 -#define IDS_FILE_DELETE_CHILD 127 -#define IDS_FILE_READ_ATTRIBUTES 128 -#define IDS_FILE_WRITE_ATTRIBUTES 129 -#define IDS_MAXIMUM_ALLOWED 130 -#define IDS_ACCESS_SYSTEM_SECURITY 131 -#define IDS_SPECIFIC_RIGHTS_ALL 132 +#define IDS_GENERIC_READ 113 +#define IDS_GENERIC_WRITE 114 +#define IDS_GENERIC_EXECUTE 115 +#define IDS_GENERIC_ALL 116 +#define IDS_FILE_GENERIC_EXECUTE 118 +#define IDS_FILE_GENERIC_READ 119 +#define IDS_FILE_GENERIC_WRITE 120 +#define IDS_FILE_READ_DATA 121 +#define IDS_FILE_WRITE_DATA 122 +#define IDS_FILE_APPEND_DATA 123 +#define IDS_FILE_READ_EA 124 +#define IDS_FILE_WRITE_EA 125 +#define IDS_FILE_EXECUTE 126 +#define IDS_FILE_DELETE_CHILD 127 +#define IDS_FILE_READ_ATTRIBUTES 128 +#define IDS_FILE_WRITE_ATTRIBUTES 129 +#define IDS_MAXIMUM_ALLOWED 130 +#define IDS_ACCESS_SYSTEM_SECURITY 131 +#define IDS_SPECIFIC_RIGHTS_ALL 132 #define IDS_STANDARD_RIGHTS_REQUIRED 133 -#define IDS_SYNCHRONIZE 134 -#define IDS_WRITE_OWNER 135 -#define IDS_WRITE_DAC 136 -#define IDS_READ_CONTROL 137 -#define IDS_DELETE 138 -#define IDS_STANDARD_RIGHTS_ALL 139 +#define IDS_SYNCHRONIZE 134 +#define IDS_WRITE_OWNER 135 +#define IDS_WRITE_DAC 136 +#define IDS_READ_CONTROL 137 +#define IDS_DELETE 138 +#define IDS_STANDARD_RIGHTS_ALL 139 #endif /* _CACLS_RESOURCE_H */ Modified: trunk/reactos/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/about.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/about.c [iso-8859-1] Wed Oct 8 11:26:50 2008 @@ -11,7 +11,9 @@ #include <precomp.h> -static INT_PTR CALLBACK +static +INT_PTR +CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Wed Oct 8 11:26:50 2008 @@ -14,7 +14,9 @@ HINSTANCE hInstance; /* Font-enumeration callback */ -static int CALLBACK +static +int +CALLBACK EnumFontNames(ENUMLOGFONTEXW *lpelfe, NEWTEXTMETRICEXW *lpntme, DWORD FontType, @@ -55,7 +57,8 @@ /* Initialize the font-list by enumeration all system fonts */ -static VOID +static +VOID FillFontStyleComboList(HWND hwndCombo) { HDC hdc; @@ -90,7 +93,8 @@ } -static VOID +static +VOID ChangeMapFont(HWND hDlg) { HWND hCombo; @@ -130,7 +134,8 @@ } -static VOID +static +VOID AddCharToSelection(HWND hText, WCHAR ch) { @@ -182,7 +187,9 @@ } -static BOOL CALLBACK +static +BOOL +CALLBACK DlgProc(HWND hDlg, UINT Message, WPARAM wParam, @@ -331,7 +338,8 @@ } -INT WINAPI +INT +WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR Cmd, Modified: trunk/reactos/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] Wed Oct 8 11:26:50 2008 @@ -10,7 +10,8 @@ #include <precomp.h> -static HFONT +static +HFONT SetLrgFont(PMAP infoPtr) { LOGFONTW lf; Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/map.c [iso-8859-1] Wed Oct 8 11:26:50 2008 @@ -12,7 +12,8 @@ static const WCHAR szMapWndClass[] = L"FontMapWnd"; static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd"; -static VOID +static +VOID TagFontToCell(PCELL pCell, WCHAR ch) { @@ -20,7 +21,8 @@ } -static VOID +static +VOID SetGrid(PMAP infoPtr) { INT x, y; @@ -42,7 +44,8 @@ } } -static VOID +static +VOID DrawActiveCell(PMAP infoPtr, HDC hdc) { @@ -55,7 +58,8 @@ } -static VOID +static +VOID DrawGrid(PMAP infoPtr, HDC hdc) { @@ -77,7 +81,8 @@ } -static VOID +static +VOID FillGrid(PMAP infoPtr, HDC hdc) { @@ -107,7 +112,8 @@ } -static BOOL +static +BOOL CreateLargeCell(PMAP infoPtr) { RECT rLarge; @@ -143,7 +149,8 @@ } -static VOID +static +VOID MoveLargeCell(PMAP infoPtr) { RECT rLarge; @@ -173,7 +180,8 @@ } -static VOID +static +VOID SetFont(PMAP infoPtr, LPWSTR lpFontName) { @@ -202,7 +210,8 @@ } -static LRESULT +static +LRESULT NotifyParentOfSelection(PMAP infoPtr, UINT code, WCHAR ch) @@ -227,7 +236,8 @@ } -static VOID +static +VOID OnClick(PMAP infoPtr, WORD ptx, WORD pty) @@ -294,7 +304,8 @@ } -static BOOL +static +BOOL OnCreate(PMAP infoPtr, HWND hwnd, HWND hParent) @@ -340,7 +351,8 @@ } -static VOID +static +VOID OnVScroll(PMAP infoPtr, INT Value, INT Pos) @@ -409,7 +421,8 @@ } -static VOID +static +VOID OnPaint(PMAP infoPtr, WPARAM wParam) { @@ -451,7 +464,8 @@ } -LRESULT CALLBACK +LRESULT +CALLBACK MapWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, Modified: trunk/reactos/base/applications/charmap/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/resource.h [iso-8859-1] Wed Oct 8 11:26:50 2008 @@ -1,19 +1,19 @@ -#define IDC_STATIC -1 +#define IDC_STATIC -1 -#define IDI_ICON 100 +#define IDI_ICON 100 -#define IDD_CHARMAP 200 -#define IDD_ABOUTBOX 201 +#define IDD_CHARMAP 200 +#define IDD_ABOUTBOX 201 -#define IDC_FONTCOMBO 1001 -#define IDC_CMHELP 1002 -#define IDC_FONTMAP 1003 -#define IDC_TEXTBOX 1004 -#define IDC_SELECT 1005 -#define IDC_COPY 1006 -#define IDC_ADVVIEW 1007 -#define IDC_DISPLAY 1008 +#define IDC_FONTCOMBO 1001 +#define IDC_CMHELP 1002 +#define IDC_FONTMAP 1003 +#define IDC_TEXTBOX 1004 +#define IDC_SELECT 1005 +#define IDC_COPY 1006 +#define IDC_ADVVIEW 1007 +#define IDC_DISPLAY 1008 #define IDC_LICENSE_EDIT 1009 -#define IDS_LICENSE 1010 -#define IDS_ABOUT 1011 +#define IDS_LICENSE 1010 +#define IDS_ABOUT 1011 Modified: trunk/reactos/base/applications/control/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/control.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/control/control.c [iso-8859-1] Wed Oct 8 11:26:50 2008 @@ -13,7 +13,8 @@ HANDLE hProcessHeap; HINSTANCE hInst; -static INT +static +INT OpenShellFolder(LPTSTR lpFolderCLSID) { TCHAR szParameters[MAX_PATH]; @@ -23,10 +24,16 @@ _tcscpy(szParameters, _T("/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}")); _tcscat(szParameters, lpFolderCLSID); - return (int)ShellExecute(NULL, _T("open"), _T("explorer.exe"), szParameters, NULL, SW_SHOWDEFAULT) > 32; + return (int) ShellExecute(NULL, + _T("open"), + _T("explorer.exe"), + szParameters, + NULL, + SW_SHOWDEFAULT) > 32; } -static INT +static +INT RunControlPanel(LPTSTR lpCmd) { TCHAR szParameters[MAX_PATH]; @@ -37,8 +44,12 @@ return RUNDLL(szParameters); } -int WINAPI -_tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) +int +WINAPI +_tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) { HKEY hKey; @@ -71,7 +82,11 @@ else if (!_tcsicmp(lpCmdLine, _T("userpasswords2"))) return RUNDLL(_T("netplwiz.dll,UsersRunDll")); /* Dialog based advanced User Account Manager */ /* It is none of them, so look for a handler in the registry */ - if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, + _T("Software\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"), + 0, + KEY_QUERY_VALUE, + &hKey) == ERROR_SUCCESS) { DWORD dwIndex; @@ -82,7 +97,14 @@ TCHAR szValueName[MAX_VALUE_NAME]; /* Get the value name and data size */ - if(RegEnumValue(hKey, dwIndex, szValueName, &dwValueSize, 0, NULL, NULL, &dwDataSize) != ERROR_SUCCESS) + if(RegEnumValue(hKey, + dwIndex, + szValueName, + &dwValueSize, + 0, + NULL, + NULL, + &dwDataSize) != ERROR_SUCCESS) break; /* Check if the parameter is the value name */ @@ -91,11 +113,18 @@ LPTSTR pszData; /* Allocate memory for the data plus two more characters, so we can quote the file name if required */ - pszData = (LPTSTR) HeapAlloc(hProcessHeap, 0, dwDataSize + 2 * sizeof(TCHAR)); + pszData = (LPTSTR) HeapAlloc(hProcessHeap, + 0, + dwDataSize + 2 * sizeof(TCHAR)); ++pszData; /* This value is the one we are looking for, so get the data. It is the path to a .cpl file */ - if(RegQueryValueEx(hKey, szValueName, 0, NULL, (LPBYTE)pszData, &dwDataSize) == ERROR_SUCCESS) + if(RegQueryValueEx(hKey, + szValueName, + 0, + NULL, + (LPBYTE)pszData, + &dwDataSize) == ERROR_SUCCESS) { INT nReturnValue; @@ -108,13 +137,17 @@ } nReturnValue = RunControlPanel(pszData); - HeapFree(hProcessHeap, 0, pszData); + HeapFree(hProcessHeap, + 0, + pszData); RegCloseKey(hKey); return nReturnValue; } - HeapFree(hProcessHeap, 0, pszData); + HeapFree(hProcessHeap, + 0, + pszData); } } Modified: trunk/reactos/base/applications/regedt32/regedt32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… ============================================================================== --- trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] Wed Oct 8 11:26:50 2008 @@ -5,19 +5,33 @@ #define REGEDIT _T("regedit.exe") -int WINAPI _tWinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst, - LPTSTR lpsCmdLine, int nCmdShow) +int +WINAPI +_tWinMain(HINSTANCE hCurInst, + HINSTANCE hPrevInst, + LPTSTR lpsCmdLine, + int nCmdShow) { TCHAR szPath[MAX_PATH]; if(GetWindowsDirectory(szPath, MAX_PATH)) { PathAppend(szPath, REGEDIT); - ShellExecute(NULL, NULL, szPath, lpsCmdLine, NULL, nCmdShow); + ShellExecute(NULL, + NULL, + szPath, + lpsCmdLine, + NULL, + nCmdShow); } else { - ShellExecute(NULL, NULL, REGEDIT, lpsCmdLine, NULL, nCmdShow); + ShellExecute(NULL, + NULL, + REGEDIT, + lpsCmdLine, + NULL, + nCmdShow); } return 0;

1 0

[dchapyshev] 36697: - Add getting icon metrics - Change icons sizes at change of system settings
by dchapyshev＠svn.reactos.org 08 Oct '08

08 Oct '08

Author: dchapyshev Date: Wed Oct 8 11:01:41 2008 New Revision: 36697 URL: http://svn.reactos.org/svn/reactos?rev=36697&view=rev Log: - Add getting icon metrics - Change icons sizes at change of system settings Modified: trunk/reactos/base/applications/msconfig/msconfig.c Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] Wed Oct 8 11:01:41 2008 @@ -12,6 +12,8 @@ HWND hMainWnd; /* Main Window */ HWND hTabWnd; /* Tab Control Window */ +UINT uXIcon = 0, uYIcon = 0; /* Icon sizes */ +HICON hDialogIcon = NULL; void MsConfig_OnTabWndSelChange(void); @@ -94,7 +96,7 @@ ShowWindow(hFreeLdrPage, SW_HIDE); ShowWindow(hServicesPage, SW_HIDE); BringWindowToTop(hSystemPage); - break; + break; case 2: //Freeldr ShowWindow(hGeneralPage, SW_HIDE); ShowWindow(hSystemPage, SW_HIDE); @@ -132,6 +134,25 @@ BringWindowToTop(hToolsPage); break; } +} + + +static +VOID +SetDialogIcon(HWND hDlg) +{ + if (hDialogIcon) DestroyIcon(hDialogIcon); + + hDialogIcon = LoadImage(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDI_APPICON), + IMAGE_ICON, + uXIcon, + uYIcon, + 0); + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hDialogIcon); } @@ -141,23 +162,31 @@ { int idctrl; LPNMHDR pnmh; - static HICON hIcon; + UINT uXIconNew, uYIconNew; switch (message) { case WM_INITDIALOG: hMainWnd = hDlg; - hIcon = LoadImage(GetModuleHandle(NULL), - MAKEINTRESOURCE(IDI_APPICON), - IMAGE_ICON, - 16, - 16, - 0); - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + + uXIcon = GetSystemMetrics(SM_CXSMICON); + uYIcon = GetSystemMetrics(SM_CYSMICON); + + SetDialogIcon(hDlg); + return OnCreate(hDlg); + + case WM_SETTINGCHANGE: + uXIconNew = GetSystemMetrics(SM_CXSMICON); + uYIconNew = GetSystemMetrics(SM_CYSMICON); + + if ((uXIcon != uXIconNew) || (uYIcon != uYIconNew)) + { + uXIcon = uXIconNew; + uYIcon = uYIconNew; + SetDialogIcon(hDlg); + } + break; case WM_COMMAND: @@ -196,8 +225,8 @@ DestroyWindow(hFreeLdrPage); if (hSystemPage) DestroyWindow(hSystemPage); - if (hIcon) - DestroyIcon(hIcon); + if (hDialogIcon) + DestroyIcon(hDialogIcon); return DefWindowProc(hDlg, message, wParam, lParam); }

1 0

[tkreuzer] 36696: remove a RETURN() macro
by tkreuzer＠svn.reactos.org 08 Oct '08

08 Oct '08

Author: tkreuzer Date: Wed Oct 8 10:41:52 2008 New Revision: 36696 URL: http://svn.reactos.org/svn/reactos?rev=36696&view=rev Log: remove a RETURN() macro Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Wed Oct 8 10:41:52 2008 @@ -1671,7 +1671,7 @@ PWINDOW Wnd; MINMAXINFO SafeMinMax; NTSTATUS Status; - DECLARE_RETURN(BOOL); + BOOL ret; USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserGetMinMaxInfo\n"); @@ -1679,7 +1679,8 @@ if(!(Window = UserGetWindowObject(hWnd))) { - RETURN( FALSE); + ret = FALSE; + goto cleanup; } UserRefObjectCo(Window, &Ref); @@ -1703,17 +1704,18 @@ if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( FALSE); - } - - RETURN( TRUE); - -CLEANUP: + ret = FALSE; + goto cleanup; + } + + ret = TRUE; + +cleanup: if (Window) UserDerefObjectCo(Window); - DPRINT("Leave NtUserGetMinMaxInfo, ret=%i\n",_ret_); + DPRINT("Leave NtUserGetMinMaxInfo, ret=%i\n", ret); UserLeave(); - END_CLEANUP; + return ret; } /* EOF */

1 0

[dchapyshev] 36695: - Update Russian translation
by dchapyshev＠svn.reactos.org 08 Oct '08

08 Oct '08

Author: dchapyshev Date: Wed Oct 8 09:48:30 2008 New Revision: 36695 URL: http://svn.reactos.org/svn/reactos?rev=36695&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] Wed Oct 8 09:48:30 2008 @@ -34,36 +34,36 @@ CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 - LTEXT "&IP address:", -1, 14, 75, 135, 8 + LTEXT "&IP àäðåñ:", -1, 14, 75, 135, 8 CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 150, 75, 80, 12 - LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 + LTEXT "&Ìàñêà ïîäñåòè:", -1, 14, 95, 135, 8 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP, 150, 95, 80, 12 - LTEXT "&Default gateway:", -1, 14, 115, 135, 8 + LTEXT "&Øëþç ïî óìîë÷àíèþ:", -1, 14, 115, 135, 8 CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP, 150, 115, 80, 12 - LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8 + LTEXT "&Îñíîâíîé DNS ñåðâåð:", -1, 14, 150, 135, 8 CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP, 150, 150, 80, 12 - LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8 + LTEXT "&Äîïîëíèòåëüíûé DNS ñåðâåð:", -1, 14, 165, 180, 8 CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP, 150, 165, 80, 12 END IDD_TCPIP_ADVIP_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "IP Settings" +CAPTION "Ïàðàìåòðû IP" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "IP addressen", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 - PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Äîáàâèòü...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Èçìåíèòü...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Óäàëèòü", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP GROUPBOX "Default gateways:", -1, 5, 100, 240, 90 CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55 - PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Äîáàâèòü...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Èçìåíèòü...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Óäàëèòü", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP GROUPBOX "", -1, 5, 200, 240, 30 - CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "Interface metric:", -1, 15, 215, 90, 12 + CHECKBOX "Àâòîìàòè÷åñêàÿ ìåòðèêà", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "Ìåòðèêà èíòåðôåéñà:", -1, 15, 215, 90, 12 EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER END @@ -74,21 +74,21 @@ BEGIN LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 - PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP - PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "&Add...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP - PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP - PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "Ââåðõ", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "Âíèç", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "&Äîáàâèòü...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "&Èçìåíèòü...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "&Óäàëèòü", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24 CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY - PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP - PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP - PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "Ââåðõ", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Âíèç", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "Ä&îáàâèòü...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "È&çìåíèòü...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "Óä&àëèòü", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP LTEXT "DNS &suffix for this connection:", -1, 5, 225, 110, 14 EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP @@ -98,52 +98,52 @@ IDD_TCPIP_ADVOPT_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Options" +CAPTION "Ïàðàìåòðû" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_OPTLIST, 5, 30, 230, 70 - LTEXT "&Optional settings", -1, 5, 15, 130, 12 - PUSHBUTTON "&Properties", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP - GROUPBOX "Description:", -1, 5, 120, 240, 70 + LTEXT "&Äîïîëíèòåëüíûå ïàðàìåòðû", -1, 5, 15, 130, 12 + PUSHBUTTON "&Ñâîéñòâà", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP + GROUPBOX "Îïèñàíèå:", -1, 5, 120, 240, 70 LTEXT "", IDC_OPTDESC, 15, 130, 220, 33 END IDD_TCPIPADDIP_DLG DIALOGEX DISCARDABLE 0, 0, 200, 70 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Address" +CAPTION "TCP/IP àäðåñ" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 - LTEXT "IP address:", -1, 5, 15, 70, 12 - LTEXT "Subnet mask:", -1, 5, 30, 70, 12 + LTEXT "IP àäðåñ:", -1, 5, 15, 70, 12 + LTEXT "Ìàñêà ïîäñåòè:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Gateway Address" +CAPTION "Àäðåñ TCP/IP øëþçà" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 - LTEXT "Gateway:", -1, 5, 15, 70, 12 - CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED + LTEXT "Øëþç:", -1, 5, 15, 70, 12 + CHECKBOX "Àâòîìàòè÷åñêàÿ ìåòðèêà", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "&Ìåòðèêà:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END IDD_TCPIPDNS_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP DNS Server" +CAPTION "TCP/IP DNS ñåðâåð" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 - LTEXT "DNS server:", -1, 5, 10, 120, 12 + LTEXT "DNS ñåðâåð:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 @@ -154,12 +154,12 @@ EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE 0, 0, 305, 220 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Filtering" +CAPTION "TCP/IP ôèëüòðàöèÿ" FONT 8, "MS Shell Dlg" BEGIN CHECKBOX "Enable TCP/IP-Filtering (All adapters)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP @@ -167,55 +167,55 @@ CONTROL "Permit All", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 CONTROL "Permit Only", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 - PUSHBUTTON "Add", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Äîáàâèòü", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Óäàëèòü", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 105, 30, 90, 150 CONTROL "Permit All", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 CONTROL "Permit Only", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 - PUSHBUTTON "Add", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Äîáàâèòü", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Óäàëèòü", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 205, 30, 90, 150 CONTROL "Permit All", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 CONTROL "Permit Only", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 - PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Äîáàâèòü", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Óäàëèòü", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "Îòìåíà", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END IDD_TCPIP_PORT_DLG DIALOGEX DISCARDABLE 0, 0, 200, 60 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Add Filter" +CAPTION "Äîáàâëåíèå ôèëüòðà" FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "Îòìåíà", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END STRINGTABLE BEGIN - IDS_NET_CONNECT "Network connection" + IDS_NET_CONNECT "Ñåòåâîå ïîäêëþ÷åíèå" IDS_NO_IPADDR_SET "The adapter requires at least one IP address. Please enter one." IDS_NO_SUBMASK_SET "You have entered an address that is missing its subnet mask. Please add a subnet mask." IDS_TCPFILTERDESC "TCP/IP filtering allows you to control the type of TCP/IP network traffic that reaches your computer." IDS_TCPFILTER "TCP/IP Filtering" - IDS_IPADDR "IP address" - IDS_SUBMASK "Subnet mask" - IDS_GATEWAY "Gateway" - IDS_METRIC "Metric" - IDS_DHCPACTIVE "DHCP Enabled" - IDS_AUTOMATIC "Automatic" + IDS_IPADDR "IP àäðåñ" + IDS_SUBMASK "Ìàñêà ïîäñåòè" + IDS_GATEWAY "Øëþç" + IDS_METRIC "Ìåòðèêà" + IDS_DHCPACTIVE "DHCP âêëþ÷åí" + IDS_AUTOMATIC "Àâòîìàòè÷åñêè" IDS_NOITEMSEL "You have not selected an item. Select one first." IDS_TCPIP "ReactOS-TCP/IP" - IDS_ADD "Add" + IDS_ADD "Äîáàâèòü" IDS_MOD "OK" - IDS_TCP_PORTS "TCP Ports" - IDS_UDP_PORTS "UDP Ports" - IDS_IP_PROTO "IP protocols" + IDS_TCP_PORTS "TCP ïðîòû" + IDS_UDP_PORTS "UDP ïðîòû" + IDS_IP_PROTO "IP ïðîòîêîëû" IDS_PORT_RANGE "Port numbers must be greater than 0 and less than 65536. Please enter a number within this range." IDS_PROT_RANGE "Protocol numbers must be greater than 0 and less than 256. Please enter a number within this range." IDS_DUP_NUMBER "The number you are trying to add is already in the list. Please enter a different number." @@ -224,6 +224,6 @@ IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." IDS_DUP_SUFFIX "The DNS suffix is already on the list." - IDS_DUP_IPADDR "The IP address is already on the list." - IDS_DUP_GW "The default gateway is already on the list." -END + IDS_DUP_IPADDR "IP àäðåñ óæå â ñïèñêå." + IDS_DUP_GW "Øëþç ïî óìîë÷àíèþ óæå â ñïèñêå." +END

1 0

[tkreuzer] 36694: Also raise hard error when dll was not found.
by tkreuzer＠svn.reactos.org 08 Oct '08

08 Oct '08

Author: tkreuzer Date: Wed Oct 8 09:37:10 2008 New Revision: 36694 URL: http://svn.reactos.org/svn/reactos?rev=36694&view=rev Log: Also raise hard error when dll was not found. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Wed Oct 8 09:37:10 2008 @@ -1358,7 +1358,16 @@ } if (!NT_SUCCESS(Status)) { + ULONG ErrorResponse; + ULONG_PTR ErrorParameter = (ULONG_PTR)&DllName; + DPRINT1("failed to load %wZ\n", &DllName); + NtRaiseHardError(STATUS_DLL_NOT_FOUND, + 1, + 1, + &ErrorParameter, + OptionOk, + &ErrorResponse); } } RtlFreeUnicodeString (&DllName); @@ -1384,7 +1393,12 @@ RtlAnsiStringToUnicodeString(&ProcName, &ProcNameAnsi, TRUE); ErrorParameters[0] = (ULONG_PTR)&ProcName; ErrorParameters[1] = (ULONG_PTR)DllName; - NtRaiseHardError(STATUS_ENTRYPOINT_NOT_FOUND, 2, 3, ErrorParameters, OptionOk, &ErrorResponse); + NtRaiseHardError(STATUS_ENTRYPOINT_NOT_FOUND, + 2, + 3, + ErrorParameters, + OptionOk, + &ErrorResponse); RtlFreeUnicodeString(&ProcName); }

1 0

[tkreuzer] 36693: Raise hard error (show message box) when imports cannot be resolved. Windows only shows the short dll name, but I think it's worth showing the full path. See issue #1228 for more details.
by tkreuzer＠svn.reactos.org 08 Oct '08

08 Oct '08

Author: tkreuzer Date: Wed Oct 8 09:09:30 2008 New Revision: 36693 URL: http://svn.reactos.org/svn/reactos?rev=36693&view=rev Log: Raise hard error (show message box) when imports cannot be resolved. Windows only shows the short dll name, but I think it's worth showing the full path. See issue #1228 for more details. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Wed Oct 8 09:09:30 2008 @@ -1365,6 +1365,29 @@ return Status; } +void +RtlpRaiseImportNotFound(CHAR *FuncName, ULONG Ordinal, PUNICODE_STRING DllName) +{ + ULONG ErrorResponse; + ULONG_PTR ErrorParameters[2]; + ANSI_STRING ProcNameAnsi; + UNICODE_STRING ProcName; + CHAR Buffer[8]; + + if (!FuncName) + { + _snprintf(Buffer, 8, "# %ld", Ordinal); + FuncName = Buffer; + } + + RtlInitAnsiString(&ProcNameAnsi, FuncName); + RtlAnsiStringToUnicodeString(&ProcName, &ProcNameAnsi, TRUE); + ErrorParameters[0] = (ULONG_PTR)&ProcName; + ErrorParameters[1] = (ULONG_PTR)DllName; + NtRaiseHardError(STATUS_ENTRYPOINT_NOT_FOUND, 2, 3, ErrorParameters, OptionOk, &ErrorResponse); + RtlFreeUnicodeString(&ProcName); +} + static NTSTATUS LdrpProcessImportDirectoryEntry(PLDR_DATA_TABLE_ENTRY Module, PLDR_DATA_TABLE_ENTRY ImportedModule, @@ -1427,7 +1450,8 @@ if ((*ImportAddressList) == NULL) { DPRINT1("Failed to import #%ld from %wZ\n", Ordinal, &ImportedModule->FullDllName); - return STATUS_UNSUCCESSFUL; + RtlpRaiseImportNotFound(NULL, Ordinal, &ImportedModule->FullDllName); + return STATUS_ENTRYPOINT_NOT_FOUND; } } else @@ -1438,7 +1462,8 @@ if ((*ImportAddressList) == NULL) { DPRINT1("Failed to import %s from %wZ\n", pe_name->Name, &ImportedModule->FullDllName); - return STATUS_UNSUCCESSFUL; + RtlpRaiseImportNotFound((CHAR*)pe_name->Name, 0, &ImportedModule->FullDllName); + return STATUS_ENTRYPOINT_NOT_FOUND; } } ImportAddressList++;

1 0

[dchapyshev] 36692: - Add getuname.dll (stub). charmap.exe from winxp work now
by dchapyshev＠svn.reactos.org 08 Oct '08

08 Oct '08

Author: dchapyshev Date: Wed Oct 8 06:51:03 2008 New Revision: 36692 URL: http://svn.reactos.org/svn/reactos?rev=36692&view=rev Log: - Add getuname.dll (stub). charmap.exe from winxp work now Added: trunk/reactos/dll/win32/getuname/ (with props) trunk/reactos/dll/win32/getuname/getuname.c (with props) trunk/reactos/dll/win32/getuname/getuname.rbuild (with props) trunk/reactos/dll/win32/getuname/getuname.rc (with props) trunk/reactos/dll/win32/getuname/getuname.spec (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=366… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Wed Oct 8 06:51:03 2008 @@ -50,6 +50,7 @@ <property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> <property name="BASEADDRESS_PSAPI" value="0x68f70000" /> <property name="BASEADDRESS_KSPROXY" value="0x68f90000" /> + <property name="BASEADDRESS_GETUNAME" value="0x69110000" /> <property name="BASEADDRESS_OLEACC" value="0x69640000" /> <property name="BASEADDRESS_WINMM" value="0x697d0000" /> <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> 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 [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Oct 8 06:51:03 2008 @@ -256,6 +256,7 @@ dll\win32\fusion\fusion.dll 1 dll\win32\gdi32\gdi32.dll 1 dll\win32\gdiplus\gdiplus.dll 1 +dll\win32\getuname\getuname.dll 1 dll\win32\glu32\glu32.dll 1 dll\win32\hhctrl.ocx\hhctrl.ocx 1 dll\win32\hid\hid.dll 1 Propchange: trunk/reactos/dll/win32/getuname/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Oct 8 06:51:03 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/getuname/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/getuname/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/getuname/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/getuname/getuname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/getunam… ============================================================================== --- trunk/reactos/dll/win32/getuname/getuname.c (added) +++ trunk/reactos/dll/win32/getuname/getuname.c [iso-8859-1] Wed Oct 8 06:51:03 2008 @@ -1,0 +1,33 @@ +/* + * PROJECT: Unicode name dll + * FILE: dll\win32\getuname\getuname.c + * PURPOSE: Main file + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +#include <windows.h> + +int +WINAPI +GetUName(IN WORD wCharCode, + OUT LPWSTR lpBuf) +{ + wcscpy(lpBuf, L"Undefined"); + return 0; +} + + +BOOL +WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/getuname/getuname.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/getuname/getuname.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/getunam… ============================================================================== --- trunk/reactos/dll/win32/getuname/getuname.rbuild (added) +++ trunk/reactos/dll/win32/getuname/getuname.rbuild [iso-8859-1] Wed Oct 8 06:51:03 2008 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="getuname" type="win32dll" baseaddress="${BASEADDRESS_GETUNAME}" installbase="system32" installname="getuname.dll" unicode="yes"> + <importlibrary definition="getuname.spec.def" /> + <include base="getuname">.</include> + <define name="_WIN32_IE">0x600</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <library>ntdll</library> + <file>getuname.c</file> + <file>getuname.rc</file> + <file>getuname.spec</file> +</module> Propchange: trunk/reactos/dll/win32/getuname/getuname.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/getuname/getuname.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/getunam… ============================================================================== --- trunk/reactos/dll/win32/getuname/getuname.rc (added) +++ trunk/reactos/dll/win32/getuname/getuname.rc [iso-8859-1] Wed Oct 8 06:51:03 2008 @@ -1,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Unicode name DLL\0" +#define REACTOS_STR_INTERNAL_NAME "getuname\0" +#define REACTOS_STR_ORIGINAL_FILENAME "getuname.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/getuname/getuname.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/getuname/getuname.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/getunam… ============================================================================== --- trunk/reactos/dll/win32/getuname/getuname.spec (added) +++ trunk/reactos/dll/win32/getuname/getuname.spec [iso-8859-1] Wed Oct 8 06:51:03 2008 @@ -1,0 +1,1 @@ +@ stdcall GetUName(long ptr) Propchange: trunk/reactos/dll/win32/getuname/getuname.spec ------------------------------------------------------------------------------ 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Wed Oct 8 06:51:03 2008 @@ -97,6 +97,9 @@ <directory name="gdiplus"> <xi:include href="gdiplus/gdiplus.rbuild" /> </directory> +<directory name="getuname"> + <xi:include href="getuname/getuname.rbuild" /> +</directory> <directory name="glu32"> <xi:include href="glu32/glu32.rbuild" /> </directory>

1 0

[tkreuzer] 36691: Add basic tests for BeginPath andd SetMapMode
by tkreuzer＠svn.reactos.org 08 Oct '08

08 Oct '08

Author: tkreuzer Date: Wed Oct 8 05:58:41 2008 New Revision: 36691 URL: http://svn.reactos.org/svn/reactos?rev=36691&view=rev Log: Add basic tests for BeginPath andd SetMapMode Added: trunk/rostests/apitests/gdi32api/tests/BeginPath.c (with props) trunk/rostests/apitests/gdi32api/tests/SetMapMode.c (with props) Modified: trunk/rostests/apitests/gdi32api/testlist.c Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Wed Oct 8 05:58:41 2008 @@ -6,6 +6,7 @@ /* include the tests */ #include "tests/AddFontResource.c" #include "tests/AddFontResourceEx.c" +#include "tests/BeginPath.c" #include "tests/CreateBitmapIndirect.c" #include "tests/CreateCompatibleDC.c" #include "tests/CreateFont.c" @@ -35,16 +36,9 @@ #include "tests/GetStockObject.c" #include "tests/SelectObject.c" #include "tests/SetDCPenColor.c" +#include "tests/SetMapMode.c" #include "tests/SetSysColors.c" #include "tests/SetWorldTransform.c" - - - - - - - - /* The List of tests */ @@ -52,6 +46,7 @@ { { L"AddFontResourceA", Test_AddFontResourceA }, { L"AddFontResourceEx", Test_AddFontResourceEx }, + { L"BeginPath", Test_BeginPath }, { L"CreateBitmapIndirect", Test_CreateBitmapIndirect }, { L"CreateCompatibleDC", Test_CreateCompatibleDC }, { L"CreateFont", Test_CreateFont }, @@ -81,6 +76,7 @@ { L"GetStockObject", Test_GetStockObject }, { L"SelectObject", Test_SelectObject }, { L"SetDCPenColor", Test_SetDCPenColor }, + { L"SetMapMode", Test_SetMapMode }, { L"SetSysColors", Test_SetSysColors }, { L"SetWorldTransform", Test_SetWorldTransform }, }; Added: trunk/rostests/apitests/gdi32api/tests/BeginPath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/B… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/BeginPath.c (added) +++ trunk/rostests/apitests/gdi32api/tests/BeginPath.c [iso-8859-1] Wed Oct 8 05:58:41 2008 @@ -1,0 +1,24 @@ + + +INT +Test_BeginPath(PTESTINFO pti) +{ + HDC hDC; + BOOL ret; + + SetLastError(0); + ret = BeginPath(0); + TEST(ret == 0); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + + hDC = CreateCompatibleDC(NULL); + + SetLastError(0); + ret = BeginPath(hDC); + TEST(ret == 1); + TEST(GetLastError() == 0); + + DeleteDC(hDC); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/BeginPath.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/SetMapMode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/S… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/SetMapMode.c (added) +++ trunk/rostests/apitests/gdi32api/tests/SetMapMode.c [iso-8859-1] Wed Oct 8 05:58:41 2008 @@ -1,0 +1,34 @@ + + + +INT +Test_SetMapMode(PTESTINFO pti) +{ + HDC hDC; + SIZE WindowExt, ViewportExt; + + hDC = CreateCompatibleDC(NULL); + ASSERT(hDC); + + GetWindowExtEx(hDC, &WindowExt); + GetViewportExtEx(hDC, &ViewportExt); + + ASSERT(WindowExt.cx == 1); + ASSERT(WindowExt.cy == 1); + ASSERT(ViewportExt.cx == 1); + ASSERT(ViewportExt.cy == 1); + + SetMapMode(hDC, MM_ISOTROPIC); + + GetWindowExtEx(hDC, &WindowExt); + GetViewportExtEx(hDC, &ViewportExt); + + TEST(WindowExt.cx == 3600); + TEST(WindowExt.cy == 2700); + TEST(ViewportExt.cx == GetDeviceCaps(GetDC(0), HORZRES)); + TEST(ViewportExt.cy == -GetDeviceCaps(GetDC(0), VERTRES)); + + DeleteDC(hDC); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/SetMapMode.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008