Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[hyperion] 33107: Revert 33105, C_ASSERT is broken

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Apr 22 14:03:21 2008 New Revision: 33107 URL: http://svn.reactos.org/svn/reactos?rev=33107&view=rev Log: Revert 33105, C_ASSERT is broken Modified: trunk/reactos/ntoskrnl/mm/pe.c Modified: trunk/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pe.c?rev=33107… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] Tue Apr 22 14:03:21 2008 @@ -178,7 +178,7 @@ ASSERT(Intsafe_CanOffsetPointer(FileHeader, FileHeaderSize)); - C_ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); + ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); ASSERT(((UINT_PTR)FileHeader % TYPE_ALIGNMENT(IMAGE_DOS_HEADER)) == 0); #define DIE(ARGS_) { DPRINT ARGS_; goto l_Return; } @@ -219,10 +219,10 @@ pinhNtHeader = (PVOID)((UINT_PTR)FileHeader + pidhDosHeader->e_lfanew); } - C_ASSERT(sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64)); - C_ASSERT(TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == TYPE_ALIGNMENT(IMAGE_NT_HEADERS64)); - C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader) == RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS64, FileHeader)); - C_ASSERT(FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader) == FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader)); + ASSERT(sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64)); + ASSERT(TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == TYPE_ALIGNMENT(IMAGE_NT_HEADERS64)); + ASSERT(RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader) == RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS64, FileHeader)); + ASSERT(FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader) == FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader)); /* * the buffer doesn't contain the NT file header, or the alignment is wrong: we @@ -307,7 +307,7 @@ nStatus = STATUS_INVALID_IMAGE_FORMAT; - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Magic)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Magic)); if(!RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Magic)) DIE(("The optional header doesn't contain the Magic field, SizeOfOptionalHeader is %X\n", cbOptHeaderSize)); @@ -324,8 +324,8 @@ DIE(("Unrecognized optional header, Magic is %X\n", piohOptHeader->Magic)); } - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SectionAlignment)); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, FileAlignment)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SectionAlignment)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, FileAlignment)); if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SectionAlignment) && RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, FileAlignment)) @@ -410,9 +410,9 @@ if((ULONG_PTR)ImageSectionObject->ImageBase % 0x10000) DIE(("ImageBase is not aligned on a 64KB boundary")); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Subsystem)); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion)); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Subsystem)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Subsystem)) { @@ -426,7 +426,7 @@ } } - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) { @@ -434,7 +434,7 @@ piohOptHeader->AddressOfEntryPoint; } - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfCode)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfCode)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfCode)) ImageSectionObject->Executable = piohOptHeader->SizeOfCode != 0; @@ -472,7 +472,7 @@ if(!Intsafe_AddULong32(&cbSectionHeadersOffsetSize, cbSectionHeadersOffset, cbSectionHeadersSize)) DIE(("Section headers too large\n")); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfHeaders)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfHeaders)); /* size of the executable's headers */ if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfHeaders))

16 years, 5 months

[dchapyshev] 33106: - Keyboard layout switching works now in ReactOS!

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Apr 22 14:01:56 2008 New Revision: 33106 URL: http://svn.reactos.org/svn/reactos?rev=33106&view=rev Log: - Keyboard layout switching works now in ReactOS! Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/kbswitch/kbswitch.h Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Tue Apr 22 14:01:56 2008 @@ -9,7 +9,6 @@ #include "kbswitch.h" #define WM_NOTIFYICONMSG (WM_USER + 248) -#define BUFSIZE 256 HINSTANCE hInst; HWND hwnd; @@ -48,14 +47,14 @@ { DWORD dwBufLen; HKEY hKey; - TCHAR szTempLCID[CCH_LAYOUT_ID + 1]; + TCHAR szTempLCID[MAX_PATH]; // Get the Layout ID if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { - dwBufLen = sizeof(szTempLCID); - - if(RegQueryValueEx(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szTempLCID, &dwBufLen) != ERROR_SUCCESS) + dwBufLen = MAX_PATH; + + if (RegQueryValueEx(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szTempLCID, &dwBufLen) != ERROR_SUCCESS) { RegCloseKey(hKey); return FALSE; @@ -65,11 +64,11 @@ } // Look for a substitude of this layout - if(RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - dwBufLen = sizeof(szTempLCID); - - if(RegQueryValueEx(hKey, szTempLCID, NULL, NULL, (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwBufLen = MAX_PATH; + + if (RegQueryValueEx(hKey, szTempLCID, NULL, NULL, (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS) { // No substitute found, then use the old LCID lstrcpy(szLCID, szTempLCID); @@ -97,11 +96,11 @@ if(!GetLayoutID(szLayoutNum, szLCID)) return FALSE; - wsprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); + _stprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCTSTR)szBuf, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { - dwBufLen = MAX_PATH * sizeof(TCHAR); + dwBufLen = MAX_PATH; if(RegQueryValueEx(hKey, _T("Layout Text"), NULL, NULL, (LPBYTE)szName, &dwBufLen) != ERROR_SUCCESS) { @@ -113,6 +112,13 @@ } return TRUE; +} + +BOOL CALLBACK +EnumWindowsProc(HWND hwnd, LPARAM lParam) +{ + SendMessage(hwnd, WM_INPUTLANGCHANGEREQUEST, 0, lParam); + return TRUE; } static VOID @@ -121,14 +127,13 @@ HKL hKl; TCHAR szLayoutNum[CCH_ULONG_DEC + 1]; TCHAR szLCID[CCH_LAYOUT_ID + 1]; - DWORD Ret; _ultot(uLayoutNum, szLayoutNum, 10); GetLayoutID(szLayoutNum, szLCID); // Switch to the new keyboard layout hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); - Ret = SystemParametersInfo(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE); + EnumWindows(EnumWindowsProc, (LPARAM) hKl); } static HMENU @@ -137,7 +142,7 @@ HMENU hMenu; HKEY hKey; DWORD dwIndex, dwSize; - LPTSTR szExit; + TCHAR szExit[MAX_PATH]; TCHAR szLayoutNum[CCH_ULONG_DEC + 1]; TCHAR szName[MAX_PATH]; @@ -160,7 +165,7 @@ RegCloseKey(hKey); } - LoadString(hInst, IDS_EXIT, (LPTSTR)&szExit, 0); + LoadString(hInst, IDS_EXIT, szExit, MAX_PATH); AppendMenu(hMenu, MF_SEPARATOR, 0, NULL); AppendMenu(hMenu, MF_STRING, MENU_ID_EXIT, szExit); @@ -230,11 +235,11 @@ WndClass.hCursor = NULL; WndClass.hbrBackground = NULL; WndClass.lpszMenuName = NULL; - WndClass.lpszClassName = L"kbswitch"; + WndClass.lpszClassName = _T("kbswitch"); if (!RegisterClass(&WndClass)) return 0; - hwnd = CreateWindow(L"kbswitch", L"kbswitch", 0, 0, 0, 1, 1, HWND_DESKTOP, NULL, hInstance, NULL); + hwnd = CreateWindow(_T("kbswitch"), _T("kbswitch"), 0, 0, 0, 1, 1, HWND_DESKTOP, NULL, hInstance, NULL); while(GetMessage(&msg,NULL,0,0)) { Modified: trunk/reactos/base/applications/kbswitch/kbswitch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] Tue Apr 22 14:01:56 2008 @@ -1,3 +1,4 @@ +#include <stdio.h> #include <stdlib.h> #include <windows.h> #include <tchar.h>

16 years, 5 months

[hyperion] 33105: modified ntoskrnl/mm/pe.c Convert as many ASSERTs as possible to C_ASSERT

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Apr 22 13:49:22 2008 New Revision: 33105 URL: http://svn.reactos.org/svn/reactos?rev=33105&view=rev Log: modified ntoskrnl/mm/pe.c Convert as many ASSERTs as possible to C_ASSERT Modified: trunk/reactos/ntoskrnl/mm/pe.c Modified: trunk/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pe.c?rev=33105… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] Tue Apr 22 13:49:22 2008 @@ -178,7 +178,7 @@ ASSERT(Intsafe_CanOffsetPointer(FileHeader, FileHeaderSize)); - ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); + C_ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); ASSERT(((UINT_PTR)FileHeader % TYPE_ALIGNMENT(IMAGE_DOS_HEADER)) == 0); #define DIE(ARGS_) { DPRINT ARGS_; goto l_Return; } @@ -219,10 +219,10 @@ pinhNtHeader = (PVOID)((UINT_PTR)FileHeader + pidhDosHeader->e_lfanew); } - ASSERT(sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64)); - ASSERT(TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == TYPE_ALIGNMENT(IMAGE_NT_HEADERS64)); - ASSERT(RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader) == RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS64, FileHeader)); - ASSERT(FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader) == FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader)); + C_ASSERT(sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64)); + C_ASSERT(TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == TYPE_ALIGNMENT(IMAGE_NT_HEADERS64)); + C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader) == RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS64, FileHeader)); + C_ASSERT(FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader) == FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader)); /* * the buffer doesn't contain the NT file header, or the alignment is wrong: we @@ -307,7 +307,7 @@ nStatus = STATUS_INVALID_IMAGE_FORMAT; - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Magic)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Magic)); if(!RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Magic)) DIE(("The optional header doesn't contain the Magic field, SizeOfOptionalHeader is %X\n", cbOptHeaderSize)); @@ -324,8 +324,8 @@ DIE(("Unrecognized optional header, Magic is %X\n", piohOptHeader->Magic)); } - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SectionAlignment)); - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, FileAlignment)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SectionAlignment)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, FileAlignment)); if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SectionAlignment) && RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, FileAlignment)) @@ -410,9 +410,9 @@ if((ULONG_PTR)ImageSectionObject->ImageBase % 0x10000) DIE(("ImageBase is not aligned on a 64KB boundary")); - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Subsystem)); - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion)); - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Subsystem)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Subsystem)) { @@ -426,7 +426,7 @@ } } - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) { @@ -434,7 +434,7 @@ piohOptHeader->AddressOfEntryPoint; } - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfCode)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfCode)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfCode)) ImageSectionObject->Executable = piohOptHeader->SizeOfCode != 0; @@ -472,7 +472,7 @@ if(!Intsafe_AddULong32(&cbSectionHeadersOffsetSize, cbSectionHeadersOffset, cbSectionHeadersSize)) DIE(("Section headers too large\n")); - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfHeaders)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfHeaders)); /* size of the executable's headers */ if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfHeaders))

16 years, 5 months

[hyperion] 33104: modified ntoskrnl/mm/pe.c Convert as many ASSERTs as possible to C_ASSERT

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Apr 22 13:32:35 2008 New Revision: 33104 URL: http://svn.reactos.org/svn/reactos?rev=33104&view=rev Log: modified ntoskrnl/mm/pe.c Convert as many ASSERTs as possible to C_ASSERT Modified: branches/hyperion/ntoskrnl/mm/pe.c Modified: branches/hyperion/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/branches/hyperion/ntoskrnl/mm/pe.c?rev=3… ============================================================================== --- branches/hyperion/ntoskrnl/mm/pe.c [iso-8859-1] (original) +++ branches/hyperion/ntoskrnl/mm/pe.c [iso-8859-1] Tue Apr 22 13:32:35 2008 @@ -178,7 +178,7 @@ ASSERT(Intsafe_CanOffsetPointer(FileHeader, FileHeaderSize)); - C_ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); + ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); ASSERT(((UINT_PTR)FileHeader % TYPE_ALIGNMENT(IMAGE_DOS_HEADER)) == 0); #define DIE(ARGS_) { DPRINT ARGS_; goto l_Return; } @@ -219,10 +219,10 @@ pinhNtHeader = (PVOID)((UINT_PTR)FileHeader + pidhDosHeader->e_lfanew); } - C_ASSERT(sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64)); - C_ASSERT(TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == TYPE_ALIGNMENT(IMAGE_NT_HEADERS64)); - C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader) == RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS64, FileHeader)); - C_ASSERT(FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader) == FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader)); + ASSERT(sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64)); + ASSERT(TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == TYPE_ALIGNMENT(IMAGE_NT_HEADERS64)); + ASSERT(RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader) == RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS64, FileHeader)); + ASSERT(FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader) == FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader)); /* * the buffer doesn't contain the NT file header, or the alignment is wrong: we @@ -307,7 +307,7 @@ nStatus = STATUS_INVALID_IMAGE_FORMAT; - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Magic)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Magic)); if(!RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Magic)) DIE(("The optional header doesn't contain the Magic field, SizeOfOptionalHeader is %X\n", cbOptHeaderSize)); @@ -324,8 +324,8 @@ DIE(("Unrecognized optional header, Magic is %X\n", piohOptHeader->Magic)); } - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SectionAlignment)); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, FileAlignment)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SectionAlignment)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, FileAlignment)); if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SectionAlignment) && RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, FileAlignment)) @@ -410,9 +410,9 @@ if((ULONG_PTR)ImageSectionObject->ImageBase % 0x10000) DIE(("ImageBase is not aligned on a 64KB boundary")); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Subsystem)); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion)); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Subsystem)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Subsystem)) { @@ -426,7 +426,7 @@ } } - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) { @@ -434,7 +434,7 @@ piohOptHeader->AddressOfEntryPoint; } - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfCode)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfCode)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfCode)) ImageSectionObject->Executable = piohOptHeader->SizeOfCode != 0; @@ -472,7 +472,7 @@ if(!Intsafe_AddULong32(&cbSectionHeadersOffsetSize, cbSectionHeadersOffset, cbSectionHeadersSize)) DIE(("Section headers too large\n")); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfHeaders)); + ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfHeaders)); /* size of the executable's headers */ if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfHeaders))

16 years, 5 months

[hyperion] 33103: Convert as many ASSERTs as possible to C_ASSERT

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Apr 22 13:19:29 2008 New Revision: 33103 URL: http://svn.reactos.org/svn/reactos?rev=33103&view=rev Log: Convert as many ASSERTs as possible to C_ASSERT Modified: branches/hyperion/ntoskrnl/mm/pe.c Modified: branches/hyperion/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/branches/hyperion/ntoskrnl/mm/pe.c?rev=3… ============================================================================== --- branches/hyperion/ntoskrnl/mm/pe.c [iso-8859-1] (original) +++ branches/hyperion/ntoskrnl/mm/pe.c [iso-8859-1] Tue Apr 22 13:19:29 2008 @@ -178,7 +178,7 @@ ASSERT(Intsafe_CanOffsetPointer(FileHeader, FileHeaderSize)); - ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); + C_ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); ASSERT(((UINT_PTR)FileHeader % TYPE_ALIGNMENT(IMAGE_DOS_HEADER)) == 0); #define DIE(ARGS_) { DPRINT ARGS_; goto l_Return; } @@ -219,10 +219,10 @@ pinhNtHeader = (PVOID)((UINT_PTR)FileHeader + pidhDosHeader->e_lfanew); } - ASSERT(sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64)); - ASSERT(TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == TYPE_ALIGNMENT(IMAGE_NT_HEADERS64)); - ASSERT(RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader) == RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS64, FileHeader)); - ASSERT(FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader) == FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader)); + C_ASSERT(sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64)); + C_ASSERT(TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == TYPE_ALIGNMENT(IMAGE_NT_HEADERS64)); + C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader) == RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS64, FileHeader)); + C_ASSERT(FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader) == FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader)); /* * the buffer doesn't contain the NT file header, or the alignment is wrong: we @@ -307,7 +307,7 @@ nStatus = STATUS_INVALID_IMAGE_FORMAT; - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Magic)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Magic)); if(!RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Magic)) DIE(("The optional header doesn't contain the Magic field, SizeOfOptionalHeader is %X\n", cbOptHeaderSize)); @@ -324,8 +324,8 @@ DIE(("Unrecognized optional header, Magic is %X\n", piohOptHeader->Magic)); } - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SectionAlignment)); - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, FileAlignment)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SectionAlignment)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, FileAlignment)); if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SectionAlignment) && RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, FileAlignment)) @@ -410,9 +410,9 @@ if((ULONG_PTR)ImageSectionObject->ImageBase % 0x10000) DIE(("ImageBase is not aligned on a 64KB boundary")); - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Subsystem)); - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion)); - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Subsystem)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Subsystem)) { @@ -426,7 +426,7 @@ } } - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) { @@ -434,7 +434,7 @@ piohOptHeader->AddressOfEntryPoint; } - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfCode)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfCode)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfCode)) ImageSectionObject->Executable = piohOptHeader->SizeOfCode != 0; @@ -472,7 +472,7 @@ if(!Intsafe_AddULong32(&cbSectionHeadersOffsetSize, cbSectionHeadersOffset, cbSectionHeadersSize)) DIE(("Section headers too large\n")); - ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfHeaders)); + C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfHeaders)); /* size of the executable's headers */ if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfHeaders))

16 years, 5 months

[hyperion] 33102: Temporary branch for BuildBot because it takes me ages to compile

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Apr 22 13:15:46 2008 New Revision: 33102 URL: http://svn.reactos.org/svn/reactos?rev=33102&view=rev Log: Temporary branch for BuildBot because it takes me ages to compile Added: branches/hyperion/ - copied from r33101, trunk/reactos/

16 years, 5 months

[gedmurphy] 33101: - force the startup code to honour the 'hide on minimize' settings - fix a bug when traversing error pages

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Apr 22 12:15:03 2008 New Revision: 33101 URL: http://svn.reactos.org/svn/reactos?rev=33101&view=rev Log: - force the startup code to honour the 'hide on minimize' settings - fix a bug when traversing error pages Modified: trunk/tools/Message Translator/GUI/MainForm.cs trunk/tools/Message Translator/GUI/Program.cs Modified: trunk/tools/Message Translator/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… ============================================================================== --- trunk/tools/Message Translator/GUI/MainForm.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/MainForm.cs [iso-8859-1] Tue Apr 22 12:15:03 2008 @@ -217,9 +217,6 @@ } else { - if (errMessages != null) - errMessages.Clear(); - Command cmd = msgTran.Messages[0]; if (cmd.MsgType == MessageType.WinError || @@ -227,6 +224,9 @@ cmd.MsgType == MessageType.NTSTATUS || cmd.MsgType == MessageType.Custom) { + if (errMessages != null) + errMessages.Clear(); + errorTypeValueLabel.Text = cmd.MsgType.ToString(); errorDecimalTxtBox.Text = cmd.Number.ToString(); errorHexTxtBox.Text = "0x" + cmd.Hex; Modified: trunk/tools/Message Translator/GUI/Program.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Pro… ============================================================================== --- trunk/tools/Message Translator/GUI/Program.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/Program.cs [iso-8859-1] Tue Apr 22 12:15:03 2008 @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Windows.Forms; +using Microsoft.Win32; namespace MsgTranslator { @@ -33,6 +34,13 @@ { // create the notify icon and it's associated context menu InitializeContext(); + + string regPath = @"Software\ReactOS\MsgTrans"; + string keyName = "HideOnMin"; + RegistryKey rk = Registry.CurrentUser.CreateSubKey(regPath); + string hideOnMin = rk.GetValue(keyName).ToString(); + if (Convert.ToBoolean(hideOnMin) == false) + ShowForm(); } private void InitializeContext()

16 years, 5 months

[gedmurphy] 33100: Bring the notification icons context menu to life

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Apr 22 11:42:35 2008 New Revision: 33100 URL: http://svn.reactos.org/svn/reactos?rev=33100&view=rev Log: Bring the notification icons context menu to life Modified: trunk/tools/Message Translator/GUI/Program.cs Modified: trunk/tools/Message Translator/GUI/Program.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Pro… ============================================================================== --- trunk/tools/Message Translator/GUI/Program.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/Program.cs [iso-8859-1] Tue Apr 22 11:42:35 2008 @@ -43,7 +43,6 @@ this.contextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.restoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.closeApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.contextMenu.SuspendLayout(); // // notifyIcon @@ -67,12 +66,14 @@ this.restoreToolStripMenuItem.Name = "restoreToolStripMenuItem"; this.restoreToolStripMenuItem.Size = new System.Drawing.Size(167, 22); this.restoreToolStripMenuItem.Text = "Restore"; + this.restoreToolStripMenuItem.Click += new System.EventHandler(this.restoreContextMenuItem_Click); // // closeApplicationToolStripMenuItem // this.closeApplicationToolStripMenuItem.Name = "closeApplicationToolStripMenuItem"; this.closeApplicationToolStripMenuItem.Size = new System.Drawing.Size(167, 22); this.closeApplicationToolStripMenuItem.Text = "Close Application"; + this.closeApplicationToolStripMenuItem.Click += new EventHandler(exitContextMenuItem_Click); } protected override void Dispose(bool disposing) @@ -110,15 +111,20 @@ ShowForm(); } - private void mainForm_Closed(object sender, EventArgs e) + private void restoreContextMenuItem_Click(object sender, EventArgs e) { - // null out the main form so we know to create a new one. - this.mainForm = null; + ShowForm(); } private void exitContextMenuItem_Click(object sender, EventArgs e) { ExitThread(); + } + + private void mainForm_Closed(object sender, EventArgs e) + { + // null out the main form so we know to create a new one. + this.mainForm = null; } protected override void ExitThreadCore()

16 years, 5 months

[gedmurphy] 33099: Hack around the standard method in which .net loads a form forcing it to load an icon in the notification area instead. From here we can manually control the creation and disposal of the form by hooking the Closed event.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Apr 22 10:05:24 2008 New Revision: 33099 URL: http://svn.reactos.org/svn/reactos?rev=33099&view=rev Log: Hack around the standard method in which .net loads a form forcing it to load an icon in the notification area instead. From here we can manually control the creation and disposal of the form by hooking the Closed event. Modified: trunk/tools/Message Translator/GUI/MainForm.Designer.cs trunk/tools/Message Translator/GUI/MainForm.cs trunk/tools/Message Translator/GUI/MainForm.resx trunk/tools/Message Translator/GUI/Program.cs Modified: trunk/tools/Message Translator/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… ============================================================================== --- trunk/tools/Message Translator/GUI/MainForm.Designer.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/MainForm.Designer.cs [iso-8859-1] Tue Apr 22 10:05:24 2008 @@ -59,10 +59,6 @@ this.optionsRunStartChkBox = new System.Windows.Forms.CheckBox(); this.optionsMinimizeChkBox = new System.Windows.Forms.CheckBox(); this.mainErrLabel = new System.Windows.Forms.Label(); - this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components); - this.contextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.restoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.closeApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); @@ -71,7 +67,6 @@ this.wndmsgTab.SuspendLayout(); this.bugurlTab.SuspendLayout(); this.optionsTab.SuspendLayout(); - this.contextMenu.SuspendLayout(); this.SuspendLayout(); // // mainLookupButton @@ -362,34 +357,6 @@ this.mainErrLabel.Size = new System.Drawing.Size(53, 13); this.mainErrLabel.TabIndex = 0; this.mainErrLabel.Text = "Message:"; - // - // notifyIcon - // - this.notifyIcon.ContextMenuStrip = this.contextMenu; - this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon"))); - this.notifyIcon.Text = "Message Translator"; - this.notifyIcon.Visible = true; - this.notifyIcon.DoubleClick += new System.EventHandler(this.notifyIcon_DoubleClick); - // - // contextMenu - // - this.contextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.restoreToolStripMenuItem, - this.closeApplicationToolStripMenuItem}); - this.contextMenu.Name = "contextMenu"; - this.contextMenu.Size = new System.Drawing.Size(168, 48); - // - // restoreToolStripMenuItem - // - this.restoreToolStripMenuItem.Name = "restoreToolStripMenuItem"; - this.restoreToolStripMenuItem.Size = new System.Drawing.Size(167, 22); - this.restoreToolStripMenuItem.Text = "Restore"; - // - // closeApplicationToolStripMenuItem - // - this.closeApplicationToolStripMenuItem.Name = "closeApplicationToolStripMenuItem"; - this.closeApplicationToolStripMenuItem.Size = new System.Drawing.Size(167, 22); - this.closeApplicationToolStripMenuItem.Text = "Close Application"; // // tabPage1 // @@ -435,7 +402,6 @@ this.bugurlTab.PerformLayout(); this.optionsTab.ResumeLayout(false); this.optionsTab.PerformLayout(); - this.contextMenu.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -456,10 +422,6 @@ private System.Windows.Forms.Label wndmsgCodeLabel; private System.Windows.Forms.Label wndmsgNumberLabel; private System.Windows.Forms.LinkLabel bugLinkLabel; - private System.Windows.Forms.NotifyIcon notifyIcon; - private System.Windows.Forms.ContextMenuStrip contextMenu; - private System.Windows.Forms.ToolStripMenuItem restoreToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem closeApplicationToolStripMenuItem; private System.Windows.Forms.TabControl mainTabControl; private System.Windows.Forms.TabPage errorMsgTab; private System.Windows.Forms.TabPage wndmsgTab; Modified: trunk/tools/Message Translator/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… ============================================================================== --- trunk/tools/Message Translator/GUI/MainForm.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/MainForm.cs [iso-8859-1] Tue Apr 22 10:05:24 2008 @@ -149,12 +149,6 @@ MessageOutput mo = new MessageOutput(); mo.MsgOut(null, ex.Message); } - } - - private void SendToTray() - { - Hide(); - notifyIcon.Visible = true; } private string GetMessageType() @@ -277,14 +271,7 @@ // setup options page optionsMinimizeChkBox.Checked = HideOnMin; optionsRunStartChkBox.Checked = RunOnStart; - notifyIcon.Visible = false; - /* - if (HideOnMin) - { - // FIXME: hide correctly - this.WindowState = FormWindowState.Minimized; - SendToTray(); - }*/ + //toolTip.SetToolTip(mainErrTxtBox, Properties.Resources.tooltipErrMsg); //toolTip.SetToolTip(mainWndMsgRadio, Properties.Resources.tooltipWndMsg); @@ -303,15 +290,8 @@ { if (FormWindowState.Minimized == WindowState && HideOnMin) { - SendToTray(); - } - } - - private void notifyIcon_DoubleClick(object sender, EventArgs e) - { - Show(); - WindowState = FormWindowState.Normal; - notifyIcon.Visible = false; + this.Close(); + } } private void mainLookupButton_Click(object sender, EventArgs e) @@ -398,4 +378,4 @@ MessageBox.Show(message); } } -} +} Modified: trunk/tools/Message Translator/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… ============================================================================== --- trunk/tools/Message Translator/GUI/MainForm.resx [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/MainForm.resx [iso-8859-1] Tue Apr 22 10:05:24 2008 @@ -117,14 +117,11 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>17, 17</value> - </metadata> - <metadata name="contextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>123, 17</value> + <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>36, 16</value> </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <data name="notifyIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAABAAQAEBAAAAEAIABoBAAARgAAABgYAAABACAAiAkAAK4EAAAgIAAAAQAgAKgQAAA2DgAAMDAAAAEA IACoJQAA3h4AACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -421,304 +418,4 @@ /////wAA////////AAD///////8AAA== </value> </data> - <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>247, 17</value> - </metadata> - <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - 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 - PwCPgD8AwAA/AMAAfwDgAP8A8AH/APgD/wD///8A////AP///wAoAAAAIAAAAEAAAAABACAAAAAAAIAQ - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAABAAAAAgAAAAQAAAAFAAAABgAAAAcAAAAHAAAACAAAAAgAAAAIAAAACAAA - AAcAAAAHAAAABgAAAAQAAAADAAAAAgAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAEAAAADAAAABQAAAAcAAAAIAAAACQAAAAsAAAAMAAAADQAAAA0AAAAOAAAADgAA - AA4AAAAOAAAADQAAAA0AAAAMAAAACwAAAAkAAAAIAAAABwAAAAUAAAACAAAAAQAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAEAAAADAAAABQAAAAcAAAAJAAAACwAAAAwAAAAOAAAAEAAAABEAAAASAAAAEwAA - ABQAAAAUAAAAFAAAABQAAAATAAAAEgAAABEAAAAQAAAADgAAAAwAAAALAAAACQAAAAcAAAAFAAAAAgAA - AAAAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAUAAAAHAAAACgAAAAwAAAAOAAAAEAAAABIAAAAUAAAAFgAA - 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 - h/8vomb3B3k98wR2O4IAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHE5EgJzOnMEej66BHg95wR4 - POkDej3gBHo9uANzOmYAcTkSAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////////////4AH//wAAP/wA - AA/8AAAP3AAAD94AAB/fgAA/z/gAH8/8AA/v+AAHz/AAA8fgAAHngAAA5/8Af+P/AH/j/wB/8f8Af/D+ - AH/4fAD/+AAA//wAAf/8AAH//gAD//+AD///wB//////////////////KAAAADAAAABgAAAAAQAgAAAA - AACAJQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAACAAAAAgAAAAMAAAADAAAABAAAAAQAAAAEAAAABAAA - AAMAAAADAAAAAgAAAAIAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAEAAAADAAAABAAAAAUAAAAFAAAABgAAAAcAAAAHAAAACAAAAAgAAAAIAAAACAAA - AAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAcAAAAHAAAABgAAAAYAAAAFAAAABAAAAAIAAAABAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAQAAAAIAAAAEAAAABQAAAAYAAAAGAAAABwAAAAgAAAAJAAAACgAAAAsAAAALAAAADAAA - AAwAAAAMAAAADQAAAA0AAAANAAAADQAAAA0AAAAMAAAADAAAAAsAAAALAAAACgAAAAoAAAAJAAAACAAA - AAcAAAAGAAAABQAAAAQAAAACAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAEAAAADAAAABAAAAAUAAAAGAAAACAAAAAkAAAAKAAAACwAAAAwAAAANAAAADgAA - AA4AAAAPAAAAEAAAABAAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAAQAAAAEAAAAA8AAAAPAAAADgAA - AA0AAAAMAAAACwAAAAoAAAAJAAAACAAAAAcAAAAGAAAABQAAAAMAAAABAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAQAAAAFAAAABgAAAAgAAAAJAAAACgAAAAsAAAANAAAADgAA - AA8AAAAQAAAAEQAAABIAAAATAAAAFAAAABQAAAAVAAAAFQAAABUAAAAVAAAAFQAAABUAAAAVAAAAFAAA - ABMAAAASAAAAEgAAABEAAAAQAAAADgAAAA0AAAAMAAAACwAAAAoAAAAIAAAABwAAAAYAAAAEAAAAAgAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAACAAAABAAAAAUAAAAHAAAACAAAAAoAAAALAAAADAAA - AA4AAAAPAAAAEAAAABIAAAATAAAAFAAAABUAAAAWAAAAFwAAABgAAAAZAAAAGQAAABoAAAAaAAAAGQAA - ABkAAAAYAAAAGAAAABcAAAAWAAAAFQAAABQAAAASAAAAEQAAABAAAAAOAAAADQAAAAwAAAAKAAAACQAA - AAcAAAAGAAAABAAAAAMAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAADAAAABQAAAAYAAAAIAAAACQAA - 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 - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// - /////wAA////////AAD///////8AAP///////wAA////////AAD///////8AAP//gAA//wAA//gAAAf/ - AAD/4AAAAP8AAP+AAAAAfwAA/4AAAAA/AAD/AAAAAD8AAP8AAAAAPwAA/4AAAAA/AAD3wAAAAH8AAPfg - AAAB/wAA9/wAAAf/AAD3/8AAA/8AAPf//wAB/wAA9//8AAB/AADz//gAAD8AAPP/8AAAHwAA8//gAAAP - AADx/4AAAAMAAPH/AAAAAQAA+f4AAAAAAAD4//+AA/8AAPj//4AD/wAA+P//gAP/AAD8f/8AA/8AAPw/ - /wAH/wAA/D/+AAf/AAD+H/4AB/8AAP4P+AAP/wAA/wPwAA//AAD/AAAAH/8AAP+AAAAf/wAA/8AAAD// - AAD/4AAAf/8AAP/wAAD//wAA//wAA///AAD//wAP//8AAP//4H///wAA////////AAD///////8AAP// - /////wAA////////AAD///////8AAA== -</value> - </data> </root> Modified: trunk/tools/Message Translator/GUI/Program.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Pro… ============================================================================== --- trunk/tools/Message Translator/GUI/Program.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/Program.cs [iso-8859-1] Tue Apr 22 10:05:24 2008 @@ -14,7 +14,121 @@ { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new MainForm()); + MsgTransApplicationContext appContext = new MsgTransApplicationContext(); + + Application.Run(appContext); + } + } + + public class MsgTransApplicationContext : ApplicationContext + { + private System.ComponentModel.IContainer components; + private System.Windows.Forms.NotifyIcon notifyIcon; + private System.Windows.Forms.ContextMenuStrip contextMenu; + private System.Windows.Forms.ToolStripMenuItem restoreToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem closeApplicationToolStripMenuItem; + private System.Windows.Forms.Form mainForm; + + public MsgTransApplicationContext() + { + // create the notify icon and it's associated context menu + InitializeContext(); + } + + private void InitializeContext() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); + this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components); + this.contextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.restoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.closeApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.contextMenu.SuspendLayout(); + + // + // notifyIcon + // + this.notifyIcon.ContextMenuStrip = this.contextMenu; + this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.notifyIcon.Text = "Message Translator"; + this.notifyIcon.Visible = true; + this.notifyIcon.DoubleClick += new System.EventHandler(this.notifyIcon_DoubleClick); + // + // contextMenu + // + this.contextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.restoreToolStripMenuItem, + this.closeApplicationToolStripMenuItem}); + this.contextMenu.Name = "contextMenu"; + this.contextMenu.Size = new System.Drawing.Size(168, 48); + // + // restoreToolStripMenuItem + // + this.restoreToolStripMenuItem.Name = "restoreToolStripMenuItem"; + this.restoreToolStripMenuItem.Size = new System.Drawing.Size(167, 22); + this.restoreToolStripMenuItem.Text = "Restore"; + // + // closeApplicationToolStripMenuItem + // + this.closeApplicationToolStripMenuItem.Name = "closeApplicationToolStripMenuItem"; + this.closeApplicationToolStripMenuItem.Size = new System.Drawing.Size(167, 22); + this.closeApplicationToolStripMenuItem.Text = "Close Application"; + } + + protected override void Dispose(bool disposing) + { + if (disposing) + { + if (components != null) + { + components.Dispose(); + } + } + } + + private void ShowForm() + { + if (mainForm == null) + { + // create a fresh new form and show it. + mainForm = new MainForm(); + mainForm.Show(); + + // hook onto the closed event so we can null out the main form + // this avoids reshowing a disposed form. + mainForm.Closed += new EventHandler(mainForm_Closed); + } + else + { + // the form is currently visible, go ahead and bring it to the front so the user can interact + mainForm.Activate(); + } + } + + private void notifyIcon_DoubleClick(object sender, EventArgs e) + { + ShowForm(); + } + + private void mainForm_Closed(object sender, EventArgs e) + { + // null out the main form so we know to create a new one. + this.mainForm = null; + } + + private void exitContextMenuItem_Click(object sender, EventArgs e) + { + ExitThread(); + } + + protected override void ExitThreadCore() + { + if (mainForm != null) + { + // before we exit, give the main form a chance to clean itself up. + mainForm.Close(); + } + base.ExitThreadCore(); } } }

16 years, 5 months

[gedmurphy] 33098: fix tab orders

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Apr 22 09:24:09 2008 New Revision: 33098 URL: http://svn.reactos.org/svn/reactos?rev=33098&view=rev Log: fix tab orders Modified: trunk/tools/Message Translator/GUI/MainForm.Designer.cs Modified: trunk/tools/Message Translator/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… ============================================================================== --- trunk/tools/Message Translator/GUI/MainForm.Designer.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/MainForm.Designer.cs [iso-8859-1] Tue Apr 22 09:24:09 2008 @@ -142,14 +142,14 @@ this.errorHexTxtBox.Name = "errorHexTxtBox"; this.errorHexTxtBox.ReadOnly = true; this.errorHexTxtBox.Size = new System.Drawing.Size(104, 20); - this.errorHexTxtBox.TabIndex = 9; + this.errorHexTxtBox.TabIndex = 6; // // errorBackButton // this.errorBackButton.Location = new System.Drawing.Point(236, 6); this.errorBackButton.Name = "errorBackButton"; this.errorBackButton.Size = new System.Drawing.Size(22, 22); - this.errorBackButton.TabIndex = 8; + this.errorBackButton.TabIndex = 3; this.errorBackButton.Text = "<"; this.errorBackButton.UseVisualStyleBackColor = true; this.errorBackButton.Click += new System.EventHandler(this.NavigateErrorPage); @@ -159,7 +159,7 @@ this.errorForwardButton.Location = new System.Drawing.Point(258, 6); this.errorForwardButton.Name = "errorForwardButton"; this.errorForwardButton.Size = new System.Drawing.Size(22, 22); - this.errorForwardButton.TabIndex = 7; + this.errorForwardButton.TabIndex = 4; this.errorForwardButton.Text = ">"; this.errorForwardButton.UseVisualStyleBackColor = true; this.errorForwardButton.Click += new System.EventHandler(this.NavigateErrorPage); @@ -170,7 +170,7 @@ this.errorTypeValueLabel.Location = new System.Drawing.Point(64, 15); this.errorTypeValueLabel.Name = "errorTypeValueLabel"; this.errorTypeValueLabel.Size = new System.Drawing.Size(0, 13); - this.errorTypeValueLabel.TabIndex = 6; + this.errorTypeValueLabel.TabIndex = 0; // // errorCodeTxtBox // @@ -178,7 +178,7 @@ this.errorCodeTxtBox.Name = "errorCodeTxtBox"; this.errorCodeTxtBox.ReadOnly = true; this.errorCodeTxtBox.Size = new System.Drawing.Size(217, 20); - this.errorCodeTxtBox.TabIndex = 5; + this.errorCodeTxtBox.TabIndex = 7; // // errorCodeLabel // @@ -186,7 +186,7 @@ this.errorCodeLabel.Location = new System.Drawing.Point(10, 67); this.errorCodeLabel.Name = "errorCodeLabel"; this.errorCodeLabel.Size = new System.Drawing.Size(35, 13); - this.errorCodeLabel.TabIndex = 4; + this.errorCodeLabel.TabIndex = 0; this.errorCodeLabel.Text = "Code:"; // // errorMessageTxtBox @@ -196,7 +196,7 @@ this.errorMessageTxtBox.Name = "errorMessageTxtBox"; this.errorMessageTxtBox.ReadOnly = true; this.errorMessageTxtBox.Size = new System.Drawing.Size(267, 59); - this.errorMessageTxtBox.TabIndex = 3; + this.errorMessageTxtBox.TabIndex = 8; // // errorDecimalTxtBox // @@ -204,7 +204,7 @@ this.errorDecimalTxtBox.Name = "errorDecimalTxtBox"; this.errorDecimalTxtBox.ReadOnly = true; this.errorDecimalTxtBox.Size = new System.Drawing.Size(98, 20); - this.errorDecimalTxtBox.TabIndex = 2; + this.errorDecimalTxtBox.TabIndex = 5; // // errorTypeLabel // @@ -263,7 +263,7 @@ this.wndmsgHexTxtBox.Name = "wndmsgHexTxtBox"; this.wndmsgHexTxtBox.ReadOnly = true; this.wndmsgHexTxtBox.Size = new System.Drawing.Size(104, 20); - this.wndmsgHexTxtBox.TabIndex = 12; + this.wndmsgHexTxtBox.TabIndex = 4; // // wndmsgDecimalTxtBox // @@ -271,7 +271,7 @@ this.wndmsgDecimalTxtBox.Name = "wndmsgDecimalTxtBox"; this.wndmsgDecimalTxtBox.ReadOnly = true; this.wndmsgDecimalTxtBox.Size = new System.Drawing.Size(98, 20); - this.wndmsgDecimalTxtBox.TabIndex = 11; + this.wndmsgDecimalTxtBox.TabIndex = 3; // // wndmsgCodeTxtBox // @@ -279,7 +279,7 @@ this.wndmsgCodeTxtBox.Name = "wndmsgCodeTxtBox"; this.wndmsgCodeTxtBox.ReadOnly = true; this.wndmsgCodeTxtBox.Size = new System.Drawing.Size(217, 20); - this.wndmsgCodeTxtBox.TabIndex = 6; + this.wndmsgCodeTxtBox.TabIndex = 5; // // wndmsgCodeLabel // @@ -287,7 +287,7 @@ this.wndmsgCodeLabel.Location = new System.Drawing.Point(10, 41); this.wndmsgCodeLabel.Name = "wndmsgCodeLabel"; this.wndmsgCodeLabel.Size = new System.Drawing.Size(35, 13); - this.wndmsgCodeLabel.TabIndex = 3; + this.wndmsgCodeLabel.TabIndex = 0; this.wndmsgCodeLabel.Text = "Code:"; // // wndmsgNumberLabel @@ -296,7 +296,7 @@ this.wndmsgNumberLabel.Location = new System.Drawing.Point(10, 15); this.wndmsgNumberLabel.Name = "wndmsgNumberLabel"; this.wndmsgNumberLabel.Size = new System.Drawing.Size(47, 13); - this.wndmsgNumberLabel.TabIndex = 4; + this.wndmsgNumberLabel.TabIndex = 0; this.wndmsgNumberLabel.Text = "Number:"; // // bugurlTab @@ -315,7 +315,7 @@ this.bugLinkLabel.Location = new System.Drawing.Point(60, 87); this.bugLinkLabel.Name = "bugLinkLabel"; this.bugLinkLabel.Size = new System.Drawing.Size(145, 13); - this.bugLinkLabel.TabIndex = 0; + this.bugLinkLabel.TabIndex = 3; this.bugLinkLabel.TabStop = true; this.bugLinkLabel.Text = "ReactOS Bugzilla Homepage"; this.bugLinkLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -338,7 +338,7 @@ this.optionsRunStartChkBox.Location = new System.Drawing.Point(5, 32); this.optionsRunStartChkBox.Name = "optionsRunStartChkBox"; this.optionsRunStartChkBox.Size = new System.Drawing.Size(150, 17); - this.optionsRunStartChkBox.TabIndex = 2; + this.optionsRunStartChkBox.TabIndex = 4; this.optionsRunStartChkBox.Text = "Run when Windows starts"; this.optionsRunStartChkBox.UseVisualStyleBackColor = true; this.optionsRunStartChkBox.CheckedChanged += new System.EventHandler(this.OptionsHaveChanged); @@ -349,7 +349,7 @@ this.optionsMinimizeChkBox.Location = new System.Drawing.Point(5, 9); this.optionsMinimizeChkBox.Name = "optionsMinimizeChkBox"; this.optionsMinimizeChkBox.Size = new System.Drawing.Size(125, 17); - this.optionsMinimizeChkBox.TabIndex = 1; + this.optionsMinimizeChkBox.TabIndex = 3; this.optionsMinimizeChkBox.Text = "Hide when minimized"; this.optionsMinimizeChkBox.UseVisualStyleBackColor = true; this.optionsMinimizeChkBox.CheckedChanged += new System.EventHandler(this.OptionsHaveChanged); @@ -360,7 +360,7 @@ this.mainErrLabel.Location = new System.Drawing.Point(16, 17); this.mainErrLabel.Name = "mainErrLabel"; this.mainErrLabel.Size = new System.Drawing.Size(53, 13); - this.mainErrLabel.TabIndex = 7; + this.mainErrLabel.TabIndex = 0; this.mainErrLabel.Text = "Message:"; // // notifyIcon

16 years, 5 months

← Newer
1
...
7
8
9
10
11
12
13
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2008