Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Aug 23 00:06:30 2006 New Revision: 23648 URL: http://svn.reactos.org/svn/reactos?rev=23648&view=rev Log: * some msvc /W4 fixes Modified: trunk/reactos/base/applications/devmgr/devmgr.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/hexedit.c trunk/reactos/base/applications/regedit/listview.c trunk/reactos/base/applications/regedit/regedit.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/devmgr/devmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgr/d… ============================================================================== --- trunk/reactos/base/applications/devmgr/devmgr.c (original) +++ trunk/reactos/base/applications/devmgr/devmgr.c Wed Aug 23 00:06:30 2006 @@ -362,6 +362,9 @@ { MSG msg; +UNREFERENCED_PARAMETER(lpCmdLine); +UNREFERENCED_PARAMETER(hInstance); + g_hInst = hInstance; if(!hPrevInstance) @@ -525,6 +528,8 @@ { DWORD dwStyle; +UNREFERENCED_PARAMETER(hInstance); + dwStyle = WS_TABSTOP | WS_CHILD | WS_BORDER | @@ -675,6 +680,8 @@ void CreateButtons(HINSTANCE hInstance, HWND hwndParent) { + + UNREFERENCED_PARAMETER(hInstance); hwndButtonListByClass = CreateWindowEx ( 0, Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c (original) +++ trunk/reactos/base/applications/regedit/framewnd.c Wed Aug 23 00:06:30 2006 @@ -735,7 +735,7 @@ { if (SelectionList->cItems == 1) { - UINT nlen = wcslen(SelectionList->aDsSelection[0].pwzName); + size_t nlen = wcslen(SelectionList->aDsSelection[0].pwzName); if (nlen >= uSize) { nlen = uSize - 1; Modified: trunk/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/hexedit.c (original) +++ trunk/reactos/base/applications/regedit/hexedit.c Wed Aug 23 00:06:30 2006 @@ -128,7 +128,7 @@ GetClientRect(hed->hWndSelf, &rcClient); hed->style = GetWindowLong(hed->hWndSelf, GWL_STYLE); - bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + bufsize = (hed->hBuffer ? (INT) LocalSize(hed->hBuffer) : 0); hed->nLines = max(bufsize / hed->ColumnsPerLine, 1); if(bufsize > hed->ColumnsPerLine && (bufsize % hed->ColumnsPerLine) > 0) { @@ -340,7 +340,7 @@ case HEHT_ADDRESS: case HEHT_ADDRESSSPACING: case HEHT_HEXDUMP: - pt.x -= hed->LeftMargin + ((4 + hed->AddressSpacing) * hed->CharWidth); + pt.x -= (SHORT) hed->LeftMargin + ((4 + hed->AddressSpacing) * hed->CharWidth); *EditField = TRUE; break; @@ -356,7 +356,7 @@ EditPos->x = min(hed->ColumnsPerLine, pt.x / BlockWidth); } - bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + bufsize = (hed->hBuffer ? (DWORD) LocalSize(hed->hBuffer) : 0); Pos = (EditPos->y * hed->ColumnsPerLine) + EditPos->x; if(Pos > bufsize) { @@ -433,7 +433,7 @@ static LRESULT HEXEDIT_HEM_COPYBUFFER(PHEXEDIT_DATA hed, PVOID Buffer, DWORD Size) { - DWORD nCpy; + size_t nCpy; if(!hed->hBuffer) { @@ -767,7 +767,7 @@ static BOOL HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode) { - DWORD bufsize; + size_t bufsize; BOOL shift, control; if(GetKeyState(VK_MENU) & 0x8000) @@ -836,15 +836,15 @@ hed->CaretLine++; if(hed->Position > (INT)bufsize) { - hed->Position = bufsize; + hed->Position = (INT) bufsize; hed->CaretLine = (hed->nLines > 0 ? hed->nLines - 1 : 0); - hed->CaretCol = bufsize % hed->ColumnsPerLine; + hed->CaretCol = (INT) bufsize % hed->ColumnsPerLine; } } else { - INT tmp = bufsize % hed->ColumnsPerLine; - hed->Position = bufsize; + INT tmp = (INT) bufsize % hed->ColumnsPerLine; + hed->Position = (INT) bufsize; hed->CaretCol = (tmp == 0 ? hed->ColumnsPerLine : tmp); } } Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c (original) +++ trunk/reactos/base/applications/regedit/listview.c Wed Aug 23 00:06:30 2006 @@ -50,7 +50,8 @@ LPCTSTR GetValueName(HWND hwndLV, int iStartAt) { - int item, len, maxLen; + int item; + size_t len, maxLen; LPTSTR newStr; LVITEM LVItem; PLINE_INFO lineinfo; Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c (original) +++ trunk/reactos/base/applications/regedit/regedit.c Wed Aug 23 00:06:30 2006 @@ -90,7 +90,7 @@ s++; ch = *s; ch2 = *(s+1); - chu = toupper(ch); + chu = (CHAR) toupper(ch); if (!ch2 || isspace(ch2)) { if (chu == 'S' || chu == 'V') { /* ignore these switches */ Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Wed Aug 23 00:06:30 2006 @@ -315,7 +315,7 @@ LPSTR getArg( LPSTR arg) { LPSTR tmp = NULL; - ULONG len; + size_t len; if (arg == NULL) return NULL; @@ -339,9 +339,9 @@ */ static void REGPROC_unescape_string(LPSTR str) { - int str_idx = 0; /* current character under analysis */ - int val_idx = 0; /* the last character of the unescaped string */ - int len = strlen(str); + size_t str_idx = 0; /* current character under analysis */ + size_t val_idx = 0; /* the last character of the unescaped string */ + size_t len = strlen(str); for (str_idx = 0; str_idx < len; str_idx++, val_idx++) { if (str[str_idx] == '\\') { str_idx++; @@ -391,7 +391,7 @@ if ( dwParseType == REG_SZ) /* no conversion for string */ { - dwLen = strlen(val_data); + dwLen = (DWORD) strlen(val_data); if (dwLen>0 && val_data[dwLen-1]=='"') { dwLen--; @@ -406,11 +406,11 @@ lpbData = convert; } else /* Convert the hexadecimal types */ { - int b_len = strlen (val_data)+2/3; + size_t b_len = strlen (val_data)+2/3; if (b_len > KEY_MAX_LEN) { bBigBuffer = HeapAlloc (GetProcessHeap(), 0, b_len); CHECK_ENOUGH_MEMORY(bBigBuffer); - dwLen = convertHexCSVToHex(val_data, bBigBuffer, b_len); + dwLen = convertHexCSVToHex(val_data, bBigBuffer, (ULONG) b_len); lpbData = bBigBuffer; } else { dwLen = convertHexCSVToHex(val_data, convert, KEY_MAX_LEN); @@ -873,7 +873,7 @@ void processRegLines(FILE *in, CommandAPI command) { LPSTR line = NULL; /* line read from input stream */ - ULONG lineSize = REG_VAL_BUF_SIZE; + size_t lineSize = REG_VAL_BUF_SIZE; line = HeapAlloc(GetProcessHeap(), 0, lineSize); CHECK_ENOUGH_MEMORY(line); @@ -907,7 +907,7 @@ /* Get as much as possible into the buffer, terminated either by * eof, error, eol or getting the maximum amount. Abort on error. */ - size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining); + size_to_get = (int) (size_remaining > INT_MAX ? INT_MAX : size_remaining); if (NULL == fgets (s, size_to_get, in)) { if (ferror(in)) { perror ("While reading input"); @@ -1146,7 +1146,7 @@ ) != ERROR_SUCCESS) { REGPROC_print_error(); } - curr_len = strlen(*reg_key_name_buf); + curr_len = (DWORD) strlen(*reg_key_name_buf); REGPROC_resize_char_buffer(reg_key_name_buf, reg_key_name_len, max_sub_key_len + curr_len + 1); REGPROC_resize_char_buffer(val_name_buf, val_name_len, @@ -1223,8 +1223,8 @@ /* position of where the next character will be printed */ /* NOTE: yes, strlen("hex:") is used even for hex(x): */ - cur_pos = strlen("\"\"=") + strlen("hex:") + - strlen(*val_name_buf); + cur_pos = (int) (strlen("\"\"=") + strlen("hex:") + + strlen(*val_name_buf)); fputs(hex_prefix, file); for (i1 = 0; i1 < val_size1; i1++) { @@ -1324,7 +1324,7 @@ HKEY key; REGPROC_resize_char_buffer(&reg_key_name_buf, &reg_key_name_len, - strlen(reg_key_name)); + (DWORD) strlen(reg_key_name)); strcpy(reg_key_name_buf, reg_key_name); /* open the specified key */ @@ -1421,7 +1421,7 @@ ) != ERROR_SUCCESS) { REGPROC_print_error(); } - curr_len = strlen(*reg_key_name_buf); + curr_len = (DWORD) strlen(*reg_key_name_buf); REGPROC_resize_char_buffer(reg_key_name_buf, reg_key_name_len, max_sub_key_len + curr_len + 1); @@ -1469,7 +1469,7 @@ } branch_name = getRegKeyName(reg_key_name); CHECK_ENOUGH_MEMORY(branch_name); - branch_name_len = strlen(branch_name); + branch_name_len = (DWORD) strlen(branch_name); if (!branch_name[0]) { fprintf(stderr,"%s: Can't delete registry class '%s'\n", getAppName(), reg_key_name); @@ -1698,7 +1698,7 @@ /* Try accessing a subkey */ if (RegOpenKeyEx(hKey, lpSubKey, 0, KEY_ALL_ACCESS, &hSubKey) == ERROR_SUCCESS) { - cbName = iSubKeyLength - _tcslen(lpSubKey) - 1; + cbName = (DWORD) iSubKeyLength - _tcslen(lpSubKey) - 1; lResult = RegEnumKeyEx(hSubKey, 0, lpSubKey + _tcslen(lpSubKey) + 1, &cbName, NULL, NULL, NULL, &ft); RegCloseKey(hSubKey); Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c (original) +++ trunk/reactos/base/applications/regedit/treeview.c Wed Aug 23 00:06:30 2006 @@ -37,7 +37,7 @@ static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPTSTR* pKeyPath, int* pPathLen, int* pMaxLen) { TVITEM item; - int maxLen, len; + size_t maxLen, len; LPTSTR newStr; item.mask = TVIF_PARAM; @@ -60,11 +60,12 @@ item.mask = TVIF_TEXT; item.hItem = hItem; item.pszText = *pKeyPath + *pPathLen; - item.cchTextMax = maxLen = *pMaxLen - *pPathLen; + maxLen = *pMaxLen - *pPathLen; + item.cchTextMax = (int) maxLen; if (!TreeView_GetItem(hwndTV, &item)) return FALSE; len = _tcslen(item.pszText); if (len < maxLen - 1) { - *pPathLen += len; + *pPathLen += (int) len; break; } newStr = HeapReAlloc(GetProcessHeap(), 0, *pKeyPath, *pMaxLen * 2); @@ -84,7 +85,7 @@ if (!pathBuffer) pathBuffer = HeapAlloc(GetProcessHeap(), 0, 1024); if (!pathBuffer) return NULL; *pathBuffer = 0; - maxLen = HeapSize(GetProcessHeap(), 0, pathBuffer); + maxLen = (int) HeapSize(GetProcessHeap(), 0, pathBuffer); if (maxLen == -1) return NULL; if (!hItem) hItem = TreeView_GetSelection(hwndTV); if (!hItem) return NULL; @@ -210,7 +211,7 @@ if (!TreeView_GetItem(hwndTV, &tvItem)) goto done; - dwActualSize += _tcslen(&pszNodes[dwActualSize]) + 1; + dwActualSize += (DWORD) _tcslen(&pszNodes[dwActualSize]) + 1; } if (pszNodes)

18 years, 4 months

[arty] 23646: Fix elrond bug. DNS timeouts now work properly even in the absence of ICMP destination unreachable or a proper response.

by arty＠svn.reactos.org

Author: arty Date: Tue Aug 22 10:23:00 2006 New Revision: 23646 URL: http://svn.reactos.org/svn/reactos?rev=23646&view=rev Log: Fix elrond bug. DNS timeouts now work properly even in the absence of ICMP destination unreachable or a proper response. Modified: trunk/reactos/lib/3rdparty/adns/adns_win32/adns_unix_calls.c Modified: trunk/reactos/lib/3rdparty/adns/adns_win32/adns_unix_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/adns_win… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/adns_win32/adns_unix_calls.c (original) +++ trunk/reactos/lib/3rdparty/adns/adns_win32/adns_unix_calls.c Tue Aug 22 10:23:00 2006 @@ -63,30 +63,35 @@ return GetCurrentProcessId(); } +/* ReactOS: Fixed gettimeofday implementation. Was wrong by a factor of + * 10 */ int gettimeofday(struct timeval *tv, struct timezone *tz) { - static __int64 Adjustment; - __int64 Now = 0; - + static __int64 Adjustment; + __int64 Now = 0; + + + if (!Adjustment) + { + SYSTEMTIME st = {1970,1,3,0,0,0,0}; - if (!Adjustment) - { - SYSTEMTIME st = {1970,1,3,0,0,0,0}; - SystemTimeToFileTime(&st, ((LPFILETIME)(VOID *)&Adjustment)); - } - - if (tz) - { - errno = EINVAL; - return -1; - } - - GetSystemTimeAsFileTime(((LPFILETIME)(VOID *)&Now)); - Now -= Adjustment; - - tv->tv_sec = (long)(Now / 100000000); - tv->tv_usec = (long)((Now / 100) - (((__int64)tv->tv_sec * 1000) * 100)); - return 0; + SystemTimeToFileTime(&st, ((LPFILETIME)(VOID *)&Adjustment)); + } + + if (tz) + { + return -1; + } + + GetSystemTimeAsFileTime(((LPFILETIME)(VOID *)&Now)); + Now -= Adjustment; + + /* 100 ns + .1 us + 10 * 1000000 */ + tv->tv_sec = (long)(Now / 10000000); + tv->tv_usec = (long)((Now / 10) % 1000000); + return 0; } /* Memory allocated in the DLL must be freed in the dll, so

18 years, 4 months

[ion] 23645: - Implement GENERATE_IDT_STUBS/GENERATE_INT_HANDLERS - Generate actual Unexpected Interrupt entries in the IDT for INTs > 0x30 (basically IRQs). - Generated all 208 Unexpected Interrupt Handlers for all INTs (using a single macro line) and implement a "Tail" function to handle them instead of bugchecking like before (they're now sent to HAL properly). - Implement INT_PROLOG macro to create KTRAP_FRAME for interrupts (similar to traps). - Part 1 of major changes to come....

by ion＠svn.reactos.org

Author: ion Date: Tue Aug 22 02:40:23 2006 New Revision: 23645 URL: http://svn.reactos.org/svn/reactos?rev=23645&view=rev Log: - Implement GENERATE_IDT_STUBS/GENERATE_INT_HANDLERS - Generate actual Unexpected Interrupt entries in the IDT for INTs > 0x30 (basically IRQs). - Generated all 208 Unexpected Interrupt Handlers for all INTs (using a single macro line) and implement a "Tail" function to handle them instead of bugchecking like before (they're now sent to HAL properly). - Implement INT_PROLOG macro to create KTRAP_FRAME for interrupts (similar to traps). - Part 1 of major changes to come.... Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2364… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Tue Aug 22 02:40:23 2006 @@ -135,6 +135,9 @@ #define KPCR_SELF 0x1C #define KPCR_PRCB 0x20 #define KPCR_IRQL 0x24 +#define KPCR_IRR 0x28 +#define KPCR_IRR_ACTIVE 0x2C +#define KPCR_IDR 0x30 #define KPCR_KD_VERSION_BLOCK 0x34 #define KPCR_IDT 0x38 #define KPCR_GDT 0x3C @@ -148,6 +151,7 @@ #define KPCR_NPX_THREAD 0x640 #define KPCR_DR6 0x428 #define KPCR_DR7 0x42C +#define KPCR_PRCB_INTERRUPT_COUNT 0x644 #define KPCR_SYSTEM_CALLS 0x6B8 #define KPCR_PRCB_DPC_ROUTINE_ACTIVE 0x994 @@ -400,6 +404,9 @@ // #define PASSIVE_LEVEL 0x0 #define APC_LEVEL 0x1 +#define DISPATCH_LEVEL 0x2 +#define CLOCK2_LEVEL 0x1C +#define HIGH_LEVEL 0x1F #endif // @@ -425,6 +432,11 @@ #define MACHINE_TYPE_MCA 0x0002 // +// Vector base +// +#define PRIMARY_VECTOR_BASE 0x30 + +// // Kernel Feature Bits // #define KF_RDTSC 0x00000002 Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Tue Aug 22 02:40:23 2006 @@ -64,19 +64,86 @@ #endif // -// @name SET_TF_DEBUG_HEADER -// -// This macro sets up the debug header in the trap frame. -// -// @param None. -// -// @remark ebp = PKTRAP_FRAME. -// edi/ebx = Have been saved and can be used. +// @name IDT +// +// This macro creates an IDT entry for the given handler +// +// @param Handler +// Pointer to the IDT handler +// +// @param Bits +// Descriptor Bits to associate +// +// @remark None. // .macro idt Handler, Bits .long \Handler .short \Bits .short KGDT_R0_CODE +.endm + +// +// @name GENERATE_IDT_STUB +// +// This macro creates an IDT entry for an unexpected interrupt handler. +// +// @param None. +// +// @remark None. +// +.macro GENERATE_IDT_STUB Number +idt _KiUnexpectedInterrupt&Number, INT_32_DPL0 +.endm + +// +// @name GENERATE_IDT_STUBS +// +// This macro creates unexpected interrupt IDT entries. +// +// @param None. +// +// @remark None. +// +.altmacro +.macro GENERATE_IDT_STUBS +.set i, 0 +.rept 208 + GENERATE_IDT_STUB %i + .set i, i + 1 +.endr +.endm + +// +// @name GENERATE_INT_HANDLER +// +// This macro creates an unexpected interrupt handler. +// +// @param None. +// +// @remark None. +// +.macro GENERATE_INT_HANDLER Number +_KiUnexpectedInterrupt&Number: + push PRIMARY_VECTOR_BASE + Number + jmp _KiEndUnexpected +.endm + +// +// @name GENERATE_INT_HANDLERS +// +// This macro creates the unexpected interrupt handlers. +// +// @param None. +// +// @remark None. +// +.altmacro +.macro GENERATE_INT_HANDLERS +.set i, 0 +.rept 208 + GENERATE_INT_HANDLER %i + .set i, i + 1 +.endr .endm // @@ -252,6 +319,93 @@ \ /* Set the Trap Frame Debug Header */ \ SET_TF_DEBUG_HEADER + +// +// @name INT_PROLOG +// +// This macro creates a standard interrupt entry prologue. +// It should be used for entry into any interrupt, including software. +// +// @param Label +// Identifying name of the caller function; will be used to append +// to the name V86, ABIOS and DR helper functions, which must exist. +// +// @remark For software interrupts, make sure that a fake INT stack is created. +// +.macro INT_PROLOG Label + /* Save fake error code */ + push esp + + /* Save the non-volatiles */ + push ebp + push ebx + push esi + push edi + + /* Skip debug registers and other stuff */ + sub esp, 0x54 + + /* Set up frame */ + mov ebp, esp + + /* Save volatiles */ + mov [esp+KTRAP_FRAME_EAX], eax + mov [esp+KTRAP_FRAME_ECX], ecx + mov [esp+KTRAP_FRAME_EDX], edx + mov dword ptr [esp+KTRAP_FRAME_EXCEPTION_LIST], -1 + + /* Check if this was from V86 Mode */ + /* test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK */ + /* jnz V86_&Label*/ + + /* Check if this was kernel mode */ + cmp dword ptr [esp+KTRAP_FRAME_CS], KGDT_R0_CODE + jz 1f + + /* Set segments */ + mov word ptr [esp+KTRAP_FRAME_FS], fs + mov word ptr [esp+KTRAP_FRAME_DS], ds + mov word ptr [esp+KTRAP_FRAME_ES], es + mov word ptr [esp+KTRAP_FRAME_GS], gs + + /* Load the segment registers */ + mov ebx, KGDT_R0_PCR + mov eax, KGDT_R3_DATA | RPL_MASK + mov fs, bx + mov ds, ax + mov es, ax + +1: + /* Save the previous exception list */ + mov ebx, [fs:KPCR_EXCEPTION_LIST] + mov [esp+KTRAP_FRAME_EXCEPTION_LIST], ebx + + /* Set the exception handler chain terminator */ + mov dword ptr [fs:KPCR_EXCEPTION_LIST], -1 + + /* Check if this is the ABIOS stack */ + /* cmp esp, 0x10000*/ + /* jb Abios_Label*/ + + /* Delete error code */ + and dword ptr [esp+KTRAP_FRAME_ERROR_CODE], 0 + + /* Get the current thread and clear direction flag */ + mov ecx, [fs:KPCR_CURRENT_THREAD] + cld + + /* Flush DR7 */ + and dword ptr [ebp+KTRAP_FRAME_DR7], 0 + + /* Check if the thread was being debugged */ + test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF + + /* Save DR registers if needed */ + //jnz Dr_&Label + + /* Set the trap frame debug header */ + SET_TF_DEBUG_HEADER +.endm // // @name SYSCALL_PROLOG Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Tue Aug 22 02:40:23 2006 @@ -46,9 +46,7 @@ idt _KiDebugService, INT_32_DPL3 /* INT 2D: Debug Service Handler */ idt _KiSystemService, INT_32_DPL3 /* INT 2E: System Call Service Handler */ idt _KiTrap0F, INT_32_DPL0 /* INT 2F: RESERVED */ -.rept 220 -idt _KiTrap0F, INT_32_DPL0 /* INT 30-FF: UNDEFINED INTERRUPTS */ -.endr +GENERATE_IDT_STUBS /* INT 30-FF: UNEXPECTED INTERRUPTS */ /* System call entrypoints: */ .globl _KiFastCallEntry @@ -62,13 +60,14 @@ .globl _KiServiceExit /* Exit from syscall */ .globl _KiServiceExit2 /* Exit from syscall with complete frame*/ .globl _Kei386EoiHelper@0 /* Exit from interrupt or H/W trap */ +.globl _Kei386EoiHelper2ndEntry /* Exit from unexpected interrupt */ .globl _KiIdtDescriptor _KiIdtDescriptor: .short 0x800 .long _KiIdt -/* FUNCTIONS ****************************************************************/ +/* SOFTWARE INTERRUPT SERVICES ***********************************************/ _KiGetTickCount: _KiCallbackReturn: @@ -490,6 +489,7 @@ CHECK_FOR_APC_DELIVER 0 /* Exit and cleanup */ +_Kei386EoiHelper2ndEntry: TRAP_EPILOG NotFromSystemCall, DoNotRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything .endfunc @@ -670,6 +670,8 @@ jmp _KiServiceExit .endfunc +/* EXCEPTION DISPATCHERS *****************************************************/ + .func CommonDispatchException _CommonDispatchException: @@ -746,6 +748,8 @@ mov ecx, 2 call _CommonDispatchException .endfunc + +/* HARDWARE TRAP HANDLERS ****************************************************/ .func KiTrap0 _KiTrap0: @@ -1291,4 +1295,54 @@ ret .endfunc - +/* INTERRUPT HANDLERS ********************************************************/ + +.globl _KiStartUnexpected +_KiStartUnexpected: + +GENERATE_INT_HANDLERS + +_KiEndUnexpected: + jmp _KiUnexpectedInterruptTail + +.func KiUnexpectedInterruptTail +_KiUnexpectedInterruptTail: + + /* Enter interrupt trap */ + INT_PROLOG(kui) + + /* Increase interrupt count */ + inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] + + /* Put vector in EBX and make space for KIRQL */ + mov ebx, [esp] + sub esp, 4 + + /* Begin interrupt */ + push esp + push ebx + push HIGH_LEVEL + call _HalBeginSystemInterrupt@12 + + /* Check if it was spurious or not */ + or eax, eax + jnz Handled + + /* Spurious, ignore it */ + add esp, 8 + jmp _Kei386EoiHelper2ndEntry + +Handled: + /* Unexpected, exit the interrupt */ + mov esi, $ + cli + call _HalEndSystemInterrupt@8 + jmp _Kei386EoiHelper@0 +.endfunc + +.globl _KiUnexpectedInterrupt +_KiUnexpectedInterrupt: + + /* Bugcheck with invalid interrupt code */ + push 0x12 + call _KeBugCheck@4 Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Tue Aug 22 02:40:23 2006 @@ -656,7 +656,7 @@ KeWaitForSingleObject@20 @KefAcquireSpinLockAtDpcLevel@4 @KefReleaseSpinLockFromDpcLevel@4 -;Kei386EoiHelper +Kei386EoiHelper@0 @KiAcquireSpinLock@4 ;KiBugCheckData DATA KiCoprocessorError@0 @@ -667,7 +667,7 @@ KiInterruptDispatch2@8 KiIpiServiceRoutine@8 @KiReleaseSpinLock@4 -KiUnexpectedInterrupt@0 +KiUnexpectedInterrupt ;Kii386SpinOnSpinLock KiRawTicks DATA LdrAccessResource@16

18 years, 4 months

[gedmurphy] 23644: - Cleanup / rewrite much of the ip config code - Move hardcoded strings into a resource file ready for translation - Query registry data for friendly names, etc. We can remove some of this when the XP/vista API, GetAdaptersAddresses is implemented. - tested in Windows, untested in ROS...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Aug 21 23:28:18 2006 New Revision: 23644 URL: http://svn.reactos.org/svn/reactos?rev=23644&view=rev Log: - Cleanup / rewrite much of the ip config code - Move hardcoded strings into a resource file ready for translation - Query registry data for friendly names, etc. We can remove some of this when the XP/vista API, GetAdaptersAddresses is implemented. - tested in Windows, untested in ROS... Added: trunk/reactos/base/applications/network/ipconfig/En.rc trunk/reactos/base/applications/network/ipconfig/resource.h Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c trunk/reactos/base/applications/network/ipconfig/ipconfig.rc Added: trunk/reactos/base/applications/network/ipconfig/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/En.rc (added) +++ trunk/reactos/base/applications/network/ipconfig/En.rc Mon Aug 21 23:28:18 2006 @@ -1,0 +1,64 @@ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BCAST "Broadcast" + IDS_P2P "Peer To Peer" + IDS_MIXED "Mixed" + IDS_HYBRID "Hybrid" + IDS_UNKNOWN "unknown" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_OTHER "Other Type Of Adapter" + IDS_ETH "Ethernet Adapter" + IDS_TOKEN "Token Ring Adapter" + IDS_FDDI "FDDI Adapter" + IDS_PPP "PPP Adapter" + IDS_LOOP "Loopback Adapter" + IDS_SLIP "SLIP Adapter" +END + +STRINGTABLE DISCARDABLE +BEGIN +/* Please keep the spacing/formatting as per En.rc when translating */ + IDS_USAGE + "\nUSAGE:\n \ + ipconfig [/? | /all | /renew [adapter] | /release [adapter] |\n \ + /flushdns | /displaydns | /registerdns |\n \ + /showclassid adapter |\n \ + /setclassid adapter [classid] ]\n \ + \n \ + where\n \ + adapter Connection name\n \ + (wildcard characters * and ? allowed, see examples)\n \ + \n \ + Options:\n \ + /? Display this help message\n \ + /all Display full configuration information.\n \ + /release Release the IP address for the specified adapter.\n \ + /renew Renew the IP address for the specified adapter.\n \ + /flushdns Purges the DNS Resolver cache.\n \ + /registerdns Refreshes all DHCP leases and re-registers DNS names.\n \ + /displaydns Display the contents of the DNS Resolver Cache.\n \ + /showclassid Displays all the dhcp class IDs allowed for adapter.\n \ + /setclassid Modifies the dhcp class id.\n \ + \n \ + The default is to display only the IP address, subnet mask and\n \ + default gateway for each adapter bound to TCP/IP.\n \ + \n \ + For Release and Renew, if no adapter name is specified, then the IP address\n \ + leases for all adapters bound to TCP/IP will be released or renewed.\n \ + \n \ + For Setclassid, if no ClassId is specified, then the ClassId is removed.\n \ + \n \ + Examples:\n \ + > ipconfig ... Show information.\n \ + > ipconfig /all ... Show detailed information\n \ + > ipconfig /renew ... renew all adapters\n \ + > ipconfig /renew EL* ... renew any connection that has its\n \ + name starting with EL\n \ + > ipconfig /release *Con* ... release all matching connections,\n \ + eg. ""Local Area Connection 1"" or\n \ + ""Local Area Connection 2""\n" +END Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c Mon Aug 21 23:28:18 2006 @@ -18,35 +18,100 @@ #include <tchar.h> #include <time.h> #include <iphlpapi.h> - +#include "resource.h" + +#define GUID_LEN 40 + +HINSTANCE hInstance; HANDLE ProcessHeap; -LPCTSTR GetNodeTypeName(UINT NodeType) -{ - switch (NodeType) - { - case 1: return _T("Broadcast"); - case 2: return _T("Peer To Peer"); - case 4: return _T("Mixed"); - case 8: return _T("Hybrid"); - default : return _T("unknown"); - } -} - -LPCTSTR GetInterfaceTypeName(UINT InterfaceType) -{ - switch (InterfaceType) - { - case MIB_IF_TYPE_OTHER: return _T("Other Type Of Adapter"); - case MIB_IF_TYPE_ETHERNET: return _T("Ethernet Adapter"); - case MIB_IF_TYPE_TOKENRING: return _T("Token Ring Adapter"); - case MIB_IF_TYPE_FDDI: return _T("FDDI Adapter"); - case MIB_IF_TYPE_PPP: return _T("PPP Adapter"); - case MIB_IF_TYPE_LOOPBACK: return _T("Loopback Adapter"); - case MIB_IF_TYPE_SLIP: return _T("SLIP Adapter"); - default: return _T("unknown"); - } -} + +LPTSTR GetNodeTypeName(UINT NodeType) +{ + static TCHAR szNode[14]; + + switch (NodeType) + { + case 1: + if (!LoadString(hInstance, IDS_BCAST, szNode, sizeof(szNode))) + return NULL; + break; + + case 2: + if (!LoadString(hInstance, IDS_P2P, szNode, sizeof(szNode))) + return NULL; + break; + + case 4: + if (!LoadString(hInstance, IDS_MIXED, szNode, sizeof(szNode))) + return NULL; + break; + + case 8: + if (!LoadString(hInstance, IDS_HYBRID, szNode, sizeof(szNode))) + return NULL; + break; + + default : + if (!LoadString(hInstance, IDS_UNKNOWN, szNode, sizeof(szNode))) + return NULL; + break; + } + + return szNode; +} + + +LPTSTR GetInterfaceTypeName(UINT InterfaceType) +{ + static TCHAR szIntType[25]; + + switch (InterfaceType) + { + case MIB_IF_TYPE_OTHER: + if (!LoadString(hInstance, IDS_OTHER, szIntType, sizeof(szIntType))) + return NULL; + break; + + case MIB_IF_TYPE_ETHERNET: + if (!LoadString(hInstance, IDS_ETH, szIntType, sizeof(szIntType))) + return NULL; + break; + + case MIB_IF_TYPE_TOKENRING: + if (!LoadString(hInstance, IDS_TOKEN, szIntType, sizeof(szIntType))) + return NULL; + break; + + case MIB_IF_TYPE_FDDI: + if (!LoadString(hInstance, IDS_FDDI, szIntType, sizeof(szIntType))) + return NULL; + break; + + case MIB_IF_TYPE_PPP: + if (!LoadString(hInstance, IDS_PPP, szIntType, sizeof(szIntType))) + return NULL; + break; + + case MIB_IF_TYPE_LOOPBACK: + if (!LoadString(hInstance, IDS_LOOP, szIntType, sizeof(szIntType))) + return NULL; + break; + + case MIB_IF_TYPE_SLIP: + if (!LoadString(hInstance, IDS_SLIP, szIntType, sizeof(szIntType))) + return NULL; + break; + + default: + if (!LoadString(hInstance, IDS_UNKNOWN, szIntType, sizeof(szIntType))) + return NULL; + break; + } + + return szIntType; +} + /* print MAC address */ PTCHAR PrintMacAddr(PBYTE Mac) @@ -59,105 +124,286 @@ return MacAddr; } -DWORD DoFormatMessage(DWORD ErrorCode) + +VOID DoFormatMessage(LONG ErrorCode) { LPVOID lpMsgBuf; - DWORD RetVal; - - if ((RetVal = FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - ErrorCode, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ - (LPTSTR) &lpMsgBuf, - 0, - NULL ))) { + //DWORD ErrorCode; + + if (ErrorCode == 0) + ErrorCode = GetLastError(); + + if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ + (LPTSTR) &lpMsgBuf, + 0, + NULL)) + { _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); - LocalFree(lpMsgBuf); - return RetVal; - } - else - return 0; -} + } +} + + +LPTSTR GetConnectionType(LPTSTR lpClass) +{ + HKEY hKey = NULL; + LPTSTR ConType = NULL; + TCHAR Path[256]; + LPTSTR PrePath = _T("SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\"); + LPTSTR PostPath = _T("\\Connection"); + DWORD PathSize; + DWORD dwType; + DWORD dwDataSize; + + /* don't overflow the buffer */ + PathSize = lstrlen(PrePath) + lstrlen(lpClass) + lstrlen(PostPath) + 1; + if (PathSize >= 255) + return NULL; + + wsprintf(Path, _T("%s%s%s"), PrePath, lpClass, PostPath); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + Path, + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) + { + if(RegQueryValueEx(hKey, + _T("Name"), + NULL, + &dwType, + NULL, + &dwDataSize) == ERROR_SUCCESS) + { + ConType = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + dwDataSize); + if (ConType == NULL) + return NULL; + + if(RegQueryValueEx(hKey, + _T("Name"), + NULL, + &dwType, + (PBYTE)ConType, + &dwDataSize) != ERROR_SUCCESS) + { + ConType = NULL; + } + } + } + + if (hKey != NULL) + RegCloseKey(hKey); + + return ConType; +} + + +LPTSTR GetConnectionDescription(LPTSTR lpClass) +{ + HKEY hBaseKey = NULL; + HKEY hClassKey = NULL; + LPTSTR lpKeyClass = NULL; + LPTSTR lpConDesc = NULL; + LPTSTR lpPath = NULL; + TCHAR szPrePath[] = _T("SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002bE10318}\\"); + DWORD dwType; + DWORD dwDataSize; + INT i; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + szPrePath, + 0, + KEY_READ, + &hBaseKey) != ERROR_SUCCESS) + { + return NULL; + } + + for (i=0; ; i++) + { + DWORD PathSize; + LONG Status; + TCHAR szName[10]; + DWORD NameLen = 9; + + if ((Status = RegEnumKeyEx(hBaseKey, + i, + szName, + &NameLen, + NULL, + NULL, + NULL, + NULL)) != ERROR_SUCCESS) + { + if (Status == ERROR_NO_MORE_ITEMS) + { + DoFormatMessage(Status); + lpConDesc = NULL; + goto CLEANUP; + } + else + continue; + } + + PathSize = lstrlen(szPrePath) + lstrlen(szName) + 1; + lpPath = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + PathSize * sizeof(TCHAR)); + if (lpPath == NULL) + goto CLEANUP; + + wsprintf(lpPath, _T("%s%s"), szPrePath, szName); + + //MessageBox(NULL, lpPath, NULL, 0); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + lpPath, + 0, + KEY_READ, + &hClassKey) != ERROR_SUCCESS) + { + goto CLEANUP; + } + + HeapFree(ProcessHeap, 0, lpPath); + lpPath = NULL; + + if(RegQueryValueEx(hClassKey, + _T("NetCfgInstanceId"), + NULL, + &dwType, + NULL, + &dwDataSize) == ERROR_SUCCESS) + { + lpKeyClass = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + dwDataSize); + if (lpKeyClass == NULL) + goto CLEANUP; + + if(RegQueryValueEx(hClassKey, + _T("NetCfgInstanceId"), + NULL, + &dwType, + (PBYTE)lpKeyClass, + &dwDataSize) != ERROR_SUCCESS) + { + lpKeyClass = NULL; + HeapFree(ProcessHeap, 0, lpKeyClass); + continue; + } + } + else + continue; + + if (!lstrcmp(lpClass, lpKeyClass)) + { + HeapFree(ProcessHeap, 0, lpKeyClass); + lpKeyClass = NULL; + + if(RegQueryValueEx(hClassKey, + _T("DriverDesc"), + NULL, + &dwType, + NULL, + &dwDataSize) == ERROR_SUCCESS) + { + lpConDesc = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + dwDataSize); + if (lpConDesc == NULL) + goto CLEANUP; + + if(RegQueryValueEx(hClassKey, + _T("DriverDesc"), + NULL, + &dwType, + (PBYTE)lpConDesc, + &dwDataSize) != ERROR_SUCCESS) + { + lpConDesc = NULL; + goto CLEANUP; + } + } + else + lpConDesc = NULL; + + break; + } + } + +CLEANUP: + if (hBaseKey != NULL) + RegCloseKey(hBaseKey); + if (hClassKey != NULL) + RegCloseKey(hClassKey); + if (lpConDesc != NULL) + HeapFree(ProcessHeap, 0, lpPath); + if (lpConDesc != NULL) + HeapFree(ProcessHeap, 0, lpKeyClass); + + return lpConDesc; +} + VOID ShowInfo(BOOL bAll) { PIP_ADAPTER_INFO pAdapterInfo = NULL; PIP_ADAPTER_INFO pAdapter = NULL; ULONG adaptOutBufLen = 0; - PFIXED_INFO pFixedInfo = NULL; - PIP_ADDR_STRING pIPAddr = NULL; ULONG netOutBufLen = 0; - DWORD ErrRet = 0; - - /* assign memory for call to GetNetworkParams */ - pFixedInfo = (FIXED_INFO *)HeapAlloc(ProcessHeap, 0, sizeof(FIXED_INFO)); - if (pFixedInfo == NULL) - { - _tprintf(_T("memory allocation error")); + /* call GetAdaptersInfo to obtain the adapter info */ + if (GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) == ERROR_BUFFER_OVERFLOW) + { + pAdapterInfo = (IP_ADAPTER_INFO *)HeapAlloc(ProcessHeap, 0, adaptOutBufLen); + if (pAdapterInfo == NULL) + return; + + if (GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) != NO_ERROR) + { + DoFormatMessage(0); + HeapFree(ProcessHeap, 0, pAdapterInfo); + return; + } + } + else + { + DoFormatMessage(0); return; } - /* set required buffer size */ + /* call GetNetworkParams to obtain the network info */ if(GetNetworkParams(pFixedInfo, &netOutBufLen) == ERROR_BUFFER_OVERFLOW) { - HeapFree(ProcessHeap, 0, pFixedInfo); pFixedInfo = (FIXED_INFO *)HeapAlloc(ProcessHeap, 0, netOutBufLen); if (pFixedInfo == NULL) - { - _tprintf(_T("memory allocation error")); return; - } - } - - if ((ErrRet = GetNetworkParams(pFixedInfo, &netOutBufLen)) != NO_ERROR) - { - _tprintf(_T("GetNetworkParams failed : ")); - DoFormatMessage(ErrRet); - HeapFree(ProcessHeap, 0, pFixedInfo); + + if (GetNetworkParams(pFixedInfo, &netOutBufLen) != NO_ERROR) + { + DoFormatMessage(0); + HeapFree(ProcessHeap, 0, pFixedInfo); + return; + } + } + else + { + DoFormatMessage(0); return; } - - - /* assign memory for call to GetAdapterInfo */ - pAdapterInfo = (IP_ADAPTER_INFO *)HeapAlloc(ProcessHeap, 0, sizeof(IP_ADAPTER_INFO)); - if (pAdapterInfo == NULL) - { - _tprintf(_T("memory allocation error")); - return; - } - - /* set required buffer size */ - if (GetAdaptersInfo( pAdapterInfo, &adaptOutBufLen) == ERROR_BUFFER_OVERFLOW) - { - HeapFree(ProcessHeap, 0, pAdapterInfo); - pAdapterInfo = (IP_ADAPTER_INFO *)HeapAlloc(ProcessHeap, 0, adaptOutBufLen); - if (pAdapterInfo == NULL) - { - _tprintf(_T("memory allocation error")); - return; - } - } - - if ((ErrRet = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) != NO_ERROR) - { - _tprintf(_T("GetAdaptersInfo failed : ")); - DoFormatMessage(ErrRet); - HeapFree(ProcessHeap, 0, pAdapterInfo); - return ; - } - - pAdapter = pAdapterInfo; _tprintf(_T("\nReactOS IP Configuration\n\n")); - if (bAll) { _tprintf(_T("\tHost Name . . . . . . . . . . . . : %s\n"), pFixedInfo->HostName); @@ -176,7 +422,14 @@ while (pAdapter) { - _tprintf(_T("\n%s ...... : \n\n"), GetInterfaceTypeName(pAdapter->Type)); + LPTSTR IntType, myConType; + + IntType = GetInterfaceTypeName(pAdapter->Type); + myConType = GetConnectionType(pAdapter->AdapterName); + + _tprintf(_T("\n%s %s: \n\n"), IntType , myConType); + + if (myConType != NULL) HeapFree(ProcessHeap, 0, myConType); /* check if the adapter is connected to the media */ if (_tcscmp(pAdapter->IpAddressList.IpAddress.String, "0.0.0.0") == 0) @@ -190,7 +443,7 @@ if (bAll) { - _tprintf(_T("\tDescription . . . . . . . . . . . : %s\n"), pAdapter->Description); + _tprintf(_T("\tDescription . . . . . . . . . . . : %s\n"), GetConnectionDescription(pAdapter->AdapterName)); /// here !! _tprintf(_T("\tPhysical Address. . . . . . . . . : %s\n"), PrintMacAddr(pAdapter->Address)); if (pAdapter->DhcpEnabled) _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : Yes\n")); @@ -205,22 +458,26 @@ if (bAll) { + PIP_ADDR_STRING pIPAddr; + if (pAdapter->DhcpEnabled) _tprintf(_T("\tDHCP Server . . . . . . . . . . . : %s\n"), pAdapter->DhcpServer.IpAddress.String); _tprintf(_T("\tDNS Servers . . . . . . . . . . . : ")); _tprintf(_T("%s\n"), pFixedInfo->DnsServerList.IpAddress.String); - pIPAddr = pFixedInfo -> DnsServerList.Next; + pIPAddr = pFixedInfo->DnsServerList.Next; while (pIPAddr) { _tprintf(_T("\t\t\t\t\t %s\n"), pIPAddr ->IpAddress.String ); - pIPAddr = pIPAddr ->Next; - } + pIPAddr = pIPAddr->Next; + } + if (pAdapter->HaveWins) { _tprintf(_T("\tPrimary WINS Server . . . . . . . : %s\n"), pAdapter->PrimaryWinsServer.IpAddress.String); _tprintf(_T("\tSecondard WINS Server . . . . . . : %s\n"), pAdapter->SecondaryWinsServer.IpAddress.String); } + if (pAdapter->DhcpEnabled) { _tprintf(_T("\tLease Obtained. . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseObtained))); @@ -240,7 +497,6 @@ VOID Release(LPTSTR Index) { IP_ADAPTER_INDEX_MAP AdapterInfo; - DWORD dwRetVal = 0; /* if interface is not given, query GetInterfaceInfo */ if (Index == NULL) @@ -248,39 +504,30 @@ PIP_INTERFACE_INFO pInfo = NULL; ULONG ulOutBufLen = 0; - pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, sizeof(IP_INTERFACE_INFO)); - if (pInfo == NULL) - { - _tprintf(_T("memory allocation error")); - return; - } - - /* Make an initial call to GetInterfaceInfo to get - * the necessary size into the ulOutBufLen variable */ - if ( GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) - { - HeapFree(ProcessHeap, 0, pInfo); + if (GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) + { pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, ulOutBufLen); if (pInfo == NULL) - { - _tprintf(_T("memory allocation error")); return; - } - } - - /* Make a second call to GetInterfaceInfo to get the actual data we want */ - if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR ) - { - CopyMemory(&AdapterInfo, &pInfo->Adapter[0], sizeof(IP_ADAPTER_INDEX_MAP)); - _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name); + + if (GetInterfaceInfo(pInfo, &ulOutBufLen) == NO_ERROR ) + { + CopyMemory(&AdapterInfo, &pInfo->Adapter[0], sizeof(IP_ADAPTER_INDEX_MAP)); + _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name); + HeapFree(ProcessHeap, 0, pInfo); + } + else + { + DoFormatMessage(0); + HeapFree(ProcessHeap, 0, pInfo); + return; + } } else { - _tprintf(_T("\nGetInterfaceInfo failed : ")); - DoFormatMessage(dwRetVal); - } - - HeapFree(ProcessHeap, 0, pInfo); + DoFormatMessage(0); + return; + } } else { @@ -294,10 +541,10 @@ /* Call IpReleaseAddress to release the IP address on the specified adapter. */ - if ((dwRetVal = IpReleaseAddress(&AdapterInfo)) != NO_ERROR) - { - _tprintf(_T("\nAn error occured while releasing interface %s : "), _T("*name*")); - DoFormatMessage(dwRetVal); + if (IpReleaseAddress(&AdapterInfo) != NO_ERROR) + { + _tprintf(_T("\nAn error occured while releasing interface %S : \n"), AdapterInfo.Name); + DoFormatMessage(0); } } @@ -308,7 +555,6 @@ VOID Renew(LPTSTR Index) { IP_ADAPTER_INDEX_MAP AdapterInfo; - DWORD dwRetVal = 0; /* if interface is not given, query GetInterfaceInfo */ if (Index == NULL) @@ -337,7 +583,7 @@ } /* Make a second call to GetInterfaceInfo to get the actual data we want */ - if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR ) + if (GetInterfaceInfo(pInfo, &ulOutBufLen) == NO_ERROR ) { CopyMemory(&AdapterInfo, &pInfo->Adapter[0], sizeof(IP_ADAPTER_INDEX_MAP)); _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name); @@ -345,7 +591,7 @@ else { _tprintf(_T("\nGetInterfaceInfo failed : ")); - DoFormatMessage(dwRetVal); + DoFormatMessage(0); } HeapFree(ProcessHeap, 0, pInfo); @@ -362,10 +608,10 @@ /* Call IpRenewAddress to renew the IP address on the specified adapter. */ - if ((dwRetVal = IpRenewAddress(&AdapterInfo)) != NO_ERROR) + if (IpRenewAddress(&AdapterInfo) != NO_ERROR) { _tprintf(_T("\nAn error occured while renew interface %s : "), _T("*name*")); - DoFormatMessage(dwRetVal); + DoFormatMessage(0); } } @@ -373,44 +619,37 @@ VOID Usage(VOID) { - _tprintf(_T("\nUSAGE:\n" - " ipconfig [/? | /all | /renew [adapter] | /release [adapter] |\n" - " /flushdns | /displaydns | /registerdns |\n" - " /showclassid adapter |\n" - " /setclassid adapter [classid] ]\n" - "\n" - "where\n" - " adapter Connection name\n" - " (wildcard characters * and ? allowed, see examples)\n" - "\n" - " Options:\n" - " /? Display this help message\n" - " /all Display full configuration information.\n" - " /release Release the IP address for the specified adapter.\n" - " /renew Renew the IP address for the specified adapter.\n" - " /flushdns Purges the DNS Resolver cache.\n" - " /registerdns Refreshes all DHCP leases and re-registers DNS names.\n" - " /displaydns Display the contents of the DNS Resolver Cache.\n" - " /showclassid Displays all the dhcp class IDs allowed for adapter.\n" - " /setclassid Modifies the dhcp class id.\n" - "\n" - "The default is to display only the IP address, subnet mask and\n" - "default gateway for each adapter bound to TCP/IP.\n" - "\n" - "For Release and Renew, if no adapter name is specified, then the IP address\n" - "leases for all adapters bound to TCP/IP will be released or renewed.\n" - "\n" - "For Setclassid, if no ClassId is specified, then the ClassId is removed.\n" - "\n" - "Examples:\n" - " > ipconfig ... Show information.\n" - " > ipconfig /all ... Show detailed information\n" - " > ipconfig /renew ... renew all adapters\n" - " > ipconfig /renew EL* ... renew any connection that has its\n" - " name starting with EL\n" - " > ipconfig /release *Con* ... release all matching connections,\n" - " eg. \"Local Area Connection 1\" or\n" - " \"Local Area Connection 2\"\n")); + HRSRC hRes; + LPTSTR lpUsage; + DWORD Size; + + LPTSTR lpName = (LPTSTR)MAKEINTRESOURCE((IDS_USAGE >> 4) + 1); + + hRes = FindResource(hInstance, + lpName, + RT_STRING); + if (hRes != NULL) + { + if ((Size = SizeofResource(hInstance, + hRes))) + { + lpUsage = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + Size); + if (lpUsage == NULL) + return; + + if (LoadString(hInstance, + IDS_USAGE, + lpUsage, + Size)) + { + _tprintf(_T("%s"), lpUsage); + } + } + } + + } int main(int argc, char *argv[]) @@ -425,6 +664,7 @@ BOOL DoShowclassid=FALSE; BOOL DoSetclassid=FALSE; + hInstance = GetModuleHandle(NULL); ProcessHeap = GetProcessHeap(); /* Parse command line for options we have been given. */ Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.rc (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.rc Mon Aug 21 23:28:18 2006 @@ -1,5 +1,13 @@ -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 ipconfig\0" -#define REACTOS_STR_INTERNAL_NAME "ipconfig\0" -#define REACTOS_STR_ORIGINAL_FILENAME "ipconfig.exe\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy(a)gmail.com)\0" +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "IP Configuration utility\0" +#define REACTOS_STR_INTERNAL_NAME "ipconfig\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ipconfig.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy <gedmurphy(a)gmail.com\0" #include <reactos/version.rc> + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#include "En.rc" Added: trunk/reactos/base/applications/network/ipconfig/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/resource.h (added) +++ trunk/reactos/base/applications/network/ipconfig/resource.h Mon Aug 21 23:28:18 2006 @@ -1,0 +1,18 @@ + +#define IDS_USAGE 100 + +#define IDS_UNKNOWN 101 + +#define IDS_BCAST 102 +#define IDS_P2P 103 +#define IDS_MIXED 104 +#define IDS_HYBRID 105 + +/* adapter types */ +#define IDS_OTHER 106 +#define IDS_ETH 107 +#define IDS_TOKEN 108 +#define IDS_FDDI 109 +#define IDS_PPP 110 +#define IDS_LOOP 111 +#define IDS_SLIP 112

18 years, 4 months

[hpoussin] 23643: Fix compilation of ntoskrnl

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 21 21:16:36 2006 New Revision: 23643 URL: http://svn.reactos.org/svn/reactos?rev=23643&view=rev Log: Fix compilation of ntoskrnl Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Mon Aug 21 21:16:36 2006 @@ -53,9 +53,8 @@ ((type) == KdbAccessReadWrite ? "rdwr" : "exec"))) #define NPX_STATE_TO_STRING(state) \ - ((state) == NPX_STATE_INVALID ? "Invalid" : \ - ((state) == NPX_STATE_VALID ? "Valid" : \ - ((state) == NPX_STATE_DIRTY ? "Dirty" : "Unknown"))) + ((state) == NPX_STATE_LOADED ? "Loaded" : \ + ((state) == NPX_STATE_NOT_LOADED ? "Not loaded" : "Unknown")) /* PROTOTYPES ****************************************************************/

18 years, 4 months

[greatlrd] 23642: Update version number to 0.3.x

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Aug 21 19:04:20 2006 New Revision: 23642 URL: http://svn.reactos.org/svn/reactos?rev=23642&view=rev Log: Update version number to 0.3.x Modified: trunk/reactos/README Modified: trunk/reactos/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/README?rev=23642&r1=23641&… ============================================================================== --- trunk/reactos/README (original) +++ trunk/reactos/README Mon Aug 21 19:04:20 2006 @@ -1,6 +1,6 @@ ======================== -ReactOS Version 0.2.x -Updated June 23rd, 2004 +ReactOS Version 0.3.x +Updated Aug 21rd, 2005 ======================== 1. What is ReactOS?

18 years, 4 months

[janderwald] 23641: * colors.c: add error checking * console.c: add defaults * layout: halfplement layout dialog

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 21 14:57:14 2006 New Revision: 23641 URL: http://svn.reactos.org/svn/reactos?rev=23641&view=rev Log: * colors.c: add error checking * console.c: add defaults * layout: halfplement layout dialog Modified: trunk/reactos/dll/win32/console/colors.c trunk/reactos/dll/win32/console/console.c trunk/reactos/dll/win32/console/console.h trunk/reactos/dll/win32/console/en.rc trunk/reactos/dll/win32/console/layout.c Modified: trunk/reactos/dll/win32/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/colors.c… ============================================================================== --- trunk/reactos/dll/win32/console/colors.c (original) +++ trunk/reactos/dll/win32/console/colors.c Mon Aug 21 14:57:14 2006 @@ -57,6 +57,12 @@ hBrush = CreateSolidBrush(nbkColor); ntColor = pConInfo->PopupText; } + + if (!hBrush) + { + return FALSE; + } + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); DeleteObject((HGDIOBJ)hBrush); ptColor = SetTextColor(drawItem->hDC, ntColor); Modified: trunk/reactos/dll/win32/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.c (original) +++ trunk/reactos/dll/win32/console/console.c Mon Aug 21 14:57:14 2006 @@ -59,7 +59,9 @@ pConInfo->ScreenBackground = RGB(0, 0, 0); pConInfo->PopupText = RGB(128, 0, 128); pConInfo->PopupBackground = RGB(255, 255, 255); - + pConInfo->WindowSize = (DWORD)MAKELONG(80, 25); + pConInfo->WindowPosition = -1; + pConInfo->ScreenBuffer = MAKELONG(80, 300); GetModuleFileName(NULL, pConInfo->szProcessName, MAX_PATH); //MessageBox(hwnd, pConInfo->szProcessName, _T("GetModuleFileName"), MB_OK); Modified: trunk/reactos/dll/win32/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.h (original) +++ trunk/reactos/dll/win32/console/console.h Mon Aug 21 14:57:14 2006 @@ -29,6 +29,12 @@ DWORD QuickEdit; DWORD InsertMode; + DWORD ScreenBuffer; + DWORD WindowSize; + DWORD WindowPosition; + + + DWORD ActiveStaticControl; COLORREF ScreenText; COLORREF ScreenBackground; Modified: trunk/reactos/dll/win32/console/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/en.rc?re… ============================================================================== --- trunk/reactos/dll/win32/console/en.rc (original) +++ trunk/reactos/dll/win32/console/en.rc Mon Aug 21 14:57:14 2006 @@ -64,21 +64,21 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Window Preview", -1, 10, 10, 65, 10 -CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_BLACKRECT | SS_SUNKEN, 10, 20, 100, 70 +CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 100, 70 GROUPBOX "Screen Buffer Size", -1, 115, 15, 115, 40 LTEXT "&Width:", -1, 120, 30, 25, 10 LTEXT "&Height:", -1, 120, 40, 25, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 170, 30, 30, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 170, 30, 30, 10 +EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 GROUPBOX "Window Size", -1, 115, 60, 115, 40 LTEXT "&W&idth:", -1, 120, 70, 25, 10 LTEXT "&H&eight:", -1, 120, 80, 25, 10 EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 170, 30, 30, 10 +CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 170, 30, 30, 10 +CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 GROUPBOX "Window Position", -1, 115, 105, 115, 55 LTEXT "&Left:", -1, 120, 120, 25, 10 LTEXT "&Top:", -1, 120, 130, 25, 10 @@ -146,5 +146,5 @@ IDS_CPLNAME "Console" IDS_CPLDESCRIPTION "Configures console properties." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" + IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" END Modified: trunk/reactos/dll/win32/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/layout.c… ============================================================================== --- trunk/reactos/dll/win32/console/layout.c (original) +++ trunk/reactos/dll/win32/console/layout.c Mon Aug 21 14:57:14 2006 @@ -27,9 +27,95 @@ { case WM_INITDIALOG: { + DWORD xres, yres; + HDC hDC; pConInfo = (PConsoleInfo) ((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); + SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, HIWORD(pConInfo->ScreenBuffer), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, LOWORD(pConInfo->ScreenBuffer), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, HIWORD(pConInfo->WindowSize), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, LOWORD(pConInfo->WindowSize), FALSE); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_HEIGHT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_WIDTH), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_HEIGHT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_WIDTH), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 0)); + + hDC = GetDC(NULL); + xres = GetDeviceCaps(hDC, HORZRES); + yres = GetDeviceCaps(hDC, VERTRES); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(xres, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), UDM_SETRANGE, 0, (LPARAM)MAKELONG(yres, 0)); + + if (pConInfo->WindowPosition != -1) + { + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, LOWORD(pConInfo->WindowPosition), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, HIWORD(pConInfo->WindowPosition), FALSE); + } + else + { + //FIXME calculate window pos from xres, yres + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, 88, FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, 88, FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), FALSE); + SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_SYSTEM_POS_WINDOW), BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + } + return TRUE; + } + case WM_DRAWITEM: + { + COLORREF bkColor; + HBRUSH hBrush; + LPDRAWITEMSTRUCT drawItem; + + bkColor = GetSysColor(COLOR_BACKGROUND); + hBrush = CreateSolidBrush(bkColor); + drawItem = (LPDRAWITEMSTRUCT) lParam; + + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + //TODO draw console image +// MoveToEx(drawItem->hDC, 0, 0, NULL); +// LineTo(drawItem->hDC, 10, 10); +// MoveToEx(drawItem->hDC, 30, 30, NULL); +// LineTo(drawItem->hDC, 40, 40); + + DeleteObject((HGDIOBJ)hBrush); + return TRUE; + } + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_CHECK_SYSTEM_POS_WINDOW: + { + LONG res = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); + if (res == BST_CHECKED) + { + ULONG left, top; + + left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); + top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); + pConInfo->WindowPosition = MAKELONG(left, top); + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), TRUE); + } + else if (res == BST_UNCHECKED) + { + pConInfo->WindowPosition = -1; + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), FALSE); + } + } + } } default: break;

18 years, 4 months

[greatlrd] 23640: revers 23614 it cause unexped regress in some api, the code need be goto thung pretty hard even try remove hardcode font in win32k, and it cause regress there and there. and cause regreess on boot time to time. sorry it took me most night figout out why. But I do not yet how to solv it.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Aug 21 09:14:22 2006 New Revision: 23640 URL: http://svn.reactos.org/svn/reactos?rev=23640&view=rev Log: revers 23614 it cause unexped regress in some api, the code need be goto thung pretty hard even try remove hardcode font in win32k, and it cause regress there and there. and cause regreess on boot time to time. sorry it took me most night figout out why. But I do not yet how to solv it. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Aug 21 09:14:22 2006 @@ -916,7 +916,7 @@ static LOGFONTW DefaultFont = { -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - L"MS Sans Serif" + L"Bitstream Vera Sans" }; RtlZeroMemory(&QueryTable, sizeof(QueryTable)); Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Mon Aug 21 09:14:22 2006 @@ -80,11 +80,11 @@ static LOGFONTW OEMFixedFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Bitstream Vera Sans Mono" }; static LOGFONTW AnsiFixedFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Bitstream Vera Sans Mono" }; /*static LOGFONTW AnsiVarFont = *{ 10, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, @@ -92,20 +92,20 @@ static LOGFONTW SystemFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Courier New" }; //Bitstream Vera Sans + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Bitstream Vera Sans" }; static LOGFONTW DeviceDefaultFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Bitstream Vera Sans" }; static LOGFONTW SystemFixedFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono - + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Bitstream Vera Sans Mono" }; + /* FIXME: Is this correct? */ static LOGFONTW DefaultGuiFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Bitstream Vera Sans" }; #define NB_STOCK_OBJECTS (DEFAULT_GUI_FONT + 1)

18 years, 4 months

[arty] 23639: Added gdi32, because we depend on CreateSolidBrush and kin.

by arty＠svn.reactos.org

Author: arty Date: Mon Aug 21 08:41:11 2006 New Revision: 23639 URL: http://svn.reactos.org/svn/reactos?rev=23639&view=rev Log: Added gdi32, because we depend on CreateSolidBrush and kin. Modified: trunk/reactos/dll/win32/console/console.rbuild Modified: trunk/reactos/dll/win32/console/console.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.rbuild (original) +++ trunk/reactos/dll/win32/console/console.rbuild Mon Aug 21 08:41:11 2006 @@ -10,6 +10,7 @@ <library>kernel32</library> <library>user32</library> <library>comctl32</library> + <library>gdi32</library> <file>console.c</file> <file>options.c</file> <file>font.c</file>

18 years, 4 months

[arty] 23638: - Fixed timeout calculation. - Fixed a couple of leaks.

by arty＠svn.reactos.org

Author: arty Date: Mon Aug 21 07:59:02 2006 New Revision: 23638 URL: http://svn.reactos.org/svn/reactos?rev=23638&view=rev Log: - Fixed timeout calculation. - Fixed a couple of leaks. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c Mon Aug 21 07:59:02 2006 @@ -597,11 +597,7 @@ ULONG i, j = 0, x; HANDLE SockEvent; BOOL HandleCounted; - - Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, - NULL, 1, FALSE ); - - if( !NT_SUCCESS(Status) ) return SOCKET_ERROR; + LARGE_INTEGER Timeout; /* Find out how many sockets we have, and how large the buffer needs * to be */ @@ -613,30 +609,54 @@ if( HandleCount < 0 || nfds != 0 ) HandleCount = nfds * 3; - PollBufferSize = sizeof(*PollInfo) + - (HandleCount * sizeof(AFD_HANDLE)); + PollBufferSize = sizeof(*PollInfo) + (HandleCount * sizeof(AFD_HANDLE)); AFD_DbgPrint(MID_TRACE,("HandleCount: %d BufferSize: %d\n", HandleCount, PollBufferSize)); + /* Convert Timeout to NT Format */ + if (timeout == NULL) { + Timeout.u.LowPart = -1; + Timeout.u.HighPart = 0x7FFFFFFF; + AFD_DbgPrint(MAX_TRACE,("Infinite timeout\n")); + } else { + Timeout = RtlEnlargedIntegerMultiply + ((timeout->tv_sec * 1000) + (timeout->tv_usec / 1000), -10000); + /* Negative timeouts are illegal. Since the kernel represents an + * incremental timeout as a negative number, we check for a positive + * result. + */ + if (Timeout.QuadPart > 0) { + if (lpErrno) *lpErrno = WSAEINVAL; + return SOCKET_ERROR; + } + AFD_DbgPrint(MAX_TRACE,("Timeout: Orig %d.%06d kernel %d\n", + timeout->tv_sec, timeout->tv_usec, + Timeout.u.LowPart)); + } + + Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + NULL, 1, FALSE ); + + if( !NT_SUCCESS(Status) ) return SOCKET_ERROR; + /* Allocate */ PollBuffer = HeapAlloc(GlobalHeap, 0, PollBufferSize); + + if (!PollBuffer) { + if (*lpErrno) *lpErrno = WSAEFAULT; + NtClose(SockEvent); + return SOCKET_ERROR; + } + PollInfo = (PAFD_POLL_INFO)PollBuffer; - + RtlZeroMemory( PollInfo, PollBufferSize ); - /* Convert Timeout to NT Format */ - if (timeout == NULL) { - PollInfo->Timeout.u.LowPart = -1; - PollInfo->Timeout.u.HighPart = 0x7FFFFFFF; - } else { - PollInfo->Timeout = RtlEnlargedIntegerMultiply - ((timeout->tv_sec * 1000) + timeout->tv_usec, -10000); - } - /* Number of handles for AFD to Check */ PollInfo->HandleCount = HandleCount; PollInfo->Exclusive = FALSE; + PollInfo->Timeout = Timeout; if (readfds != NULL) { for (i = 0; i < readfds->fd_count; i++, j++) { @@ -734,6 +754,7 @@ } } + HeapFree( GlobalHeap, 0, PollBuffer ); NtClose( SockEvent ); AFD_DbgPrint(MID_TRACE,("lpErrno = %x\n", lpErrno));

18 years, 4 months

← Newer
1
...
18
19
20
21
22
23
24
...
45
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 August 2006