Ros-diffs January 2015

ros-diffs@reactos.org

17 participants
207 discussions

[tkreuzer] 66075: [WIN32K] Fix broken ASSERTs CORE-8938 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 22 21:03:46 2015 New Revision: 66075 URL: http://svn.reactos.org/svn/reactos?rev=66075&view=rev Log: [WIN32K] Fix broken ASSERTs CORE-8938 #resolve Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Thu Jan 22 21:03:46 2015 @@ -459,7 +459,7 @@ DC_vUpdateDC(PDC pdc) { // PREGION VisRgn ; - PPDEVOBJ ppdev = pdc->ppdev ; + PPDEVOBJ ppdev = pdc->ppdev; pdc->dhpdev = ppdev->dhpdev; Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Thu Jan 22 21:03:46 2015 @@ -737,8 +737,8 @@ lpr = &rgnSrc->Buffer[i]; /* Make sure the source rect is not retarded */ - ASSERT(lpr->bottom > rect->top); - ASSERT(lpr->right > rect->left); + ASSERT(lpr->bottom > lpr->top); + ASSERT(lpr->right > lpr->left); /* We already checked above, this should hold true */ ASSERT(lpr->bottom > rect->top); @@ -749,15 +749,15 @@ { rpr = &rgnDst->Buffer[j]; - /* Crop the rect with the intersect rect and add offset */ + /* Crop the rect with the intersect rect */ rpr->top = max(lpr->top, rect->top); rpr->bottom = min(lpr->bottom, rect->bottom); rpr->left = max(lpr->left, rect->left); rpr->right = min(lpr->right, rect->right); /* Make sure the resulting rect is not retarded */ - ASSERT(lpr->bottom > rect->top); - ASSERT(lpr->right > rect->left); + ASSERT(rpr->bottom > rpr->top); + ASSERT(rpr->right > rpr->left); /* Track new bounds */ if (rpr->left < left) left = rpr->left;

9 years, 11 months

[jimtabor] 66074: [NtUser] - Finally fix ATI tests. Break through while testing User32:win.c:test_window_from_point. See CORE-6551. - If any trouble, please create a new Jira report.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jan 21 23:15:28 2015 New Revision: 66074 URL: http://svn.reactos.org/svn/reactos?rev=66074&view=rev Log: [NtUser] - Finally fix ATI tests. Break through while testing User32:win.c:test_window_from_point. See CORE-6551. - If any trouble, please create a new Jira report. Modified: trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Wed Jan 21 23:15:28 2015 @@ -150,7 +150,7 @@ HWND *phwndTopLevel, *phwndCurrent; PWND pwndCurrent, pwndDesktop; - pwndDesktop = UserGetDesktopWindow(); + pwndDesktop = co_GetDesktopWindow(Window);//UserGetDesktopWindow(); if (Window->spwndParent == pwndDesktop ) { phwndTopLevel = IntWinListChildren(pwndDesktop); @@ -168,8 +168,9 @@ ExFreePool(phwndTopLevel); } } - } - //// + //// + } + OldTID = WindowPrev ? IntGetWndThreadId(WindowPrev) : NULL; NewTID = Window ? IntGetWndThreadId(Window) : NULL; ptiOld = WindowPrev ? WindowPrev->head.pti : NULL; @@ -245,10 +246,10 @@ (WPARAM)(Window == (gpqForeground ? gpqForeground->spwndActive : NULL)), 0); //(LPARAM)hWndPrev); - co_IntSendMessageNoWait( UserHMGetHandle(Window), - WM_ACTIVATE, - MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, Window->style & WS_MINIMIZE), - (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); + co_IntSendMessage( UserHMGetHandle(Window), + WM_ACTIVATE, + MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, Window->style & WS_MINIMIZE), + (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); if (Window->spwndParent == UserGetDesktopWindow() && Window->spwndOwner == NULL && @@ -528,7 +529,7 @@ else { //ERR("Activate Not same PQ and WQ and Wnd.\n"); - co_IntSendMessageNoWait(hWnd, WM_ASYNC_SETACTIVEWINDOW, (WPARAM)Wnd, (LPARAM)MouseActivate ); + co_IntSendMessage(hWnd, WM_ASYNC_SETACTIVEWINDOW, (WPARAM)Wnd, (LPARAM)MouseActivate ); Ret = TRUE; } return Ret && fgRet; Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Wed Jan 21 23:15:28 2015 @@ -1111,7 +1111,7 @@ if ( ptiCur ) { if (!Window || - Window->head.pti->MessageQueue == ptiCur->MessageQueue ) + Window->head.pti == ptiCur ) { return NULL; }

9 years, 11 months

[hbelusca] 66073: [REACTOS] HybridCD: Move the livecd.iso file into the livecd directory.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 21 22:24:47 2015 New Revision: 66073 URL: http://svn.reactos.org/svn/reactos?rev=66073&view=rev Log: [REACTOS] HybridCD: Move the livecd.iso file into the livecd directory. Modified: trunk/reactos/boot/bootdata/hybridcd.ini trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/boot/bootdata/hybridcd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hybridcd.ini… ============================================================================== --- trunk/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] Wed Jan 21 22:24:47 2015 @@ -61,14 +61,14 @@ [LiveCD_RamDisk] BootType=Windows2003 SystemPath=ramdisk(0)\reactos -Options=/MININT /RDPATH=livecd.iso /RDEXPORTASCD +Options=/MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD [LiveCD_RamDisk_Debug] BootType=Windows2003 SystemPath=ramdisk(0)\reactos -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd.iso /RDEXPORTASCD +Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD [LiveCD_RamDisk_Screen] BootType=Windows2003 SystemPath=ramdisk(0)\reactos -Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd.iso /RDEXPORTASCD +Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Wed Jan 21 22:24:47 2015 @@ -419,7 +419,7 @@ add_cd_file( FILE ${CMAKE_CURRENT_BINARY_DIR}/livecd.iso - DESTINATION root + DESTINATION livecd FOR hybridcd) get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST)

9 years, 11 months

[akhaldi] 66072: [TCPIP_DRVTEST] Temporarily fix build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 21 18:38:26 2015 New Revision: 66072 URL: http://svn.reactos.org/svn/reactos?rev=66072&view=rev Log: [TCPIP_DRVTEST] Temporarily fix build. Modified: trunk/rostests/drivers/tcpip/tcp_info.c Modified: trunk/rostests/drivers/tcpip/tcp_info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/tcp_info.c?… ============================================================================== --- trunk/rostests/drivers/tcpip/tcp_info.c [iso-8859-1] (original) +++ trunk/rostests/drivers/tcpip/tcp_info.c [iso-8859-1] Wed Jan 21 18:38:26 2015 @@ -14,6 +14,10 @@ #include <tdiinfo.h> #include <iptypes.h> #include <winsock.h> + +/* FIXME */ +#define AT_MIB_ADDRXLAT_INFO_ID 1 +#define AT_MIB_ADDRXLAT_ENTRY_ID 0x101 /* Route info */ typedef struct IPRouteEntry {

9 years, 11 months

[jgardou] 66071: [TCPIP_DRVTEST] - Actually print the physical address of the ARP table entry.

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jan 21 16:01:02 2015 New Revision: 66071 URL: http://svn.reactos.org/svn/reactos?rev=66071&view=rev Log: [TCPIP_DRVTEST] - Actually print the physical address of the ARP table entry. Modified: trunk/rostests/drivers/tcpip/tcp_info.c Modified: trunk/rostests/drivers/tcpip/tcp_info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/tcp_info.c?… ============================================================================== --- trunk/rostests/drivers/tcpip/tcp_info.c [iso-8859-1] (original) +++ trunk/rostests/drivers/tcpip/tcp_info.c [iso-8859-1] Wed Jan 21 16:01:02 2015 @@ -449,7 +449,7 @@ IndentationLevel++; indent_printf("ae_index: %lu\n", ArpEntries[i].ae_index); - indent_printf("ae_physaddr: %lu\n", dbg_print_physaddr(ArpEntries[i].ae_physaddr, ArpEntries[i].ae_physaddrlen)); + indent_printf("ae_physaddr: %s\n", dbg_print_physaddr(ArpEntries[i].ae_physaddr, ArpEntries[i].ae_physaddrlen)); indent_printf("ae_address: %lx (%s)\n", ArpEntries[i].ae_address, AddressString); indent_printf("ae_unknown: %lu.\n", ArpEntries[i].ae_unknown);

9 years, 11 months

[jgardou] 66070: [TCPIP_DRVTEST] - Add quite a lot of tests for IOCTL_TCP_QUERY_INFORMATION_EX This IOCTL is quite important because that's how iphlpapi gets data from it. Also, this can be used as...

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jan 21 15:55:00 2015 New Revision: 66070 URL: http://svn.reactos.org/svn/reactos?rev=66070&view=rev Log: [TCPIP_DRVTEST] - Add quite a lot of tests for IOCTL_TCP_QUERY_INFORMATION_EX This IOCTL is quite important because that's how iphlpapi gets data from it. Also, this can be used as a viewer for quite a lot SNMP info as described here: http://www.oidview.com/mibs/0/RFC1213-MIB.html Added: trunk/rostests/drivers/tcpip/tcp_info.c (with props) Modified: trunk/rostests/drivers/tcpip/CMakeLists.txt trunk/rostests/drivers/tcpip/testlist.c Modified: trunk/rostests/drivers/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/CMakeLists.… ============================================================================== --- trunk/rostests/drivers/tcpip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/drivers/tcpip/CMakeLists.txt [iso-8859-1] Wed Jan 21 15:55:00 2015 @@ -3,6 +3,7 @@ list(APPEND SOURCE InterfaceInfo.c + tcp_info.c testlist.c) add_executable(tcpip_drvtest ${SOURCE}) Added: trunk/rostests/drivers/tcpip/tcp_info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/tcp_info.c?… ============================================================================== --- trunk/rostests/drivers/tcpip/tcp_info.c (added) +++ trunk/rostests/drivers/tcpip/tcp_info.c [iso-8859-1] Wed Jan 21 15:55:00 2015 @@ -0,0 +1,580 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for IOCTL_TCP_QUERY_INFORMATION_EX + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <apitest.h> + +#include <stdio.h> + +#include <winioctl.h> +#include <tcpioctl.h> +#include <tdiinfo.h> +#include <iptypes.h> +#include <winsock.h> + +/* Route info */ +typedef struct IPRouteEntry { + unsigned long ire_dest; + unsigned long ire_index; + unsigned long ire_metric1; + unsigned long ire_metric2; + unsigned long ire_metric3; + unsigned long ire_metric4; + unsigned long ire_nexthop; + unsigned long ire_type; + unsigned long ire_proto; + unsigned long ire_age; + unsigned long ire_mask; + unsigned long ire_metric5; + unsigned long ire_context; +} IPRouteEntry; + +/* Present in headers for Vista+, but there in WinXP/2k3 ntdll */ +NTSYSAPI +PSTR +NTAPI +RtlIpv4AddressToStringA( + _In_ const struct in_addr *Addr, + _Out_writes_(16) PSTR S); + + +static HANDLE TcpFileHandle; + +static ULONG IndentationLevel = 0; + +static +char* +dbg_print_physaddr(const unsigned char* addr, unsigned long addr_len) +{ + static char buffer[24]; + + char* dest = buffer; + *dest = '\0'; + + while (addr_len--) + { + dest += sprintf(dest, "%02x", *addr); + addr++; + if (addr_len) + *dest++ = ':'; + } + + return buffer; +} + +static +int +__cdecl +indent_printf(const char* format, ...) +{ + ULONG Indent = IndentationLevel; + int ret; + va_list args; + + while(Indent--) + printf("\t"); + + va_start(args, format); + ret = vprintf(format, args); + va_end(args); + + ret += IndentationLevel; + + return ret; +} + +static +void +test_IF_MIB_STATS( + TDIEntityID Id, + ULONG EntityType) +{ + IFEntry* IfEntry; + TCP_REQUEST_QUERY_INFORMATION_EX Request; + ULONG BufferSize = sizeof(IFEntry) + MAX_ADAPTER_DESCRIPTION_LENGTH + 1; + BOOL Result; + + /* Not valid for other entity types */ + if (EntityType != IF_MIB) + return; + + IfEntry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, BufferSize); + ok(IfEntry != NULL, "\n"); + + ZeroMemory(&Request, sizeof(Request)); + Request.ID.toi_entity = Id; + Request.ID.toi_class = INFO_CLASS_PROTOCOL; + Request.ID.toi_type = INFO_TYPE_PROVIDER; + Request.ID.toi_id = IF_MIB_STATS_ID; + + Result = DeviceIoControl( + TcpFileHandle, + IOCTL_TCP_QUERY_INFORMATION_EX, + &Request, + sizeof(Request), + IfEntry, + BufferSize, + &BufferSize, + NULL); + ok(Result, "DeviceIoControl failed.\n"); + + /* Dump it */ + indent_printf("IF_MIB Statistics:\n"); + IndentationLevel++; + indent_printf("if_index: %lu\n", IfEntry->if_index); + indent_printf("if_type: %lu\n", IfEntry->if_type); + indent_printf("if_mtu: %lu\n", IfEntry->if_mtu); + indent_printf("if_speed: %lu\n", IfEntry->if_speed); + indent_printf("if_physaddr: %s\n", dbg_print_physaddr(IfEntry->if_physaddr, IfEntry->if_physaddrlen)); + indent_printf("if_adminstatus: %lu\n", IfEntry->if_adminstatus); + indent_printf("if_operstatus: %lu\n", IfEntry->if_operstatus); + indent_printf("if_lastchange: %lu\n", IfEntry->if_lastchange); + indent_printf("if_inoctets: %lu\n", IfEntry->if_inoctets); + indent_printf("if_inucastpkts: %lu\n", IfEntry->if_inucastpkts); + indent_printf("if_innucastpkts: %lu\n", IfEntry->if_innucastpkts); + indent_printf("if_indiscards: %lu\n", IfEntry->if_indiscards); + indent_printf("if_inerrors: %lu\n", IfEntry->if_inerrors); + indent_printf("if_inunknownprotos: %lu\n", IfEntry->if_inunknownprotos); + indent_printf("if_outoctets: %lu\n", IfEntry->if_outoctets); + indent_printf("if_outucastpkts: %lu\n", IfEntry->if_outucastpkts); + indent_printf("if_outnucastpkts: %lu\n", IfEntry->if_outnucastpkts); + indent_printf("if_outdiscards: %lu\n", IfEntry->if_outdiscards); + indent_printf("if_outerrors: %lu\n", IfEntry->if_outerrors); + indent_printf("if_outqlen: %lu\n", IfEntry->if_outqlen); + indent_printf("if_descr: %*s\n", IfEntry->if_descrlen, IfEntry->if_descr); + IndentationLevel--; + + HeapFree(GetProcessHeap(), 0, IfEntry); +} + +static +void +test_IP_MIB_STATS( + TDIEntityID Id, + ULONG EntityType) +{ + IPSNMPInfo IpSnmpInfo; + TCP_REQUEST_QUERY_INFORMATION_EX Request; + ULONG BufferSize = 0; + BOOL Result; + + /* Not valid for other entity types */ + if (EntityType != CL_NL_IP) + return; + + ZeroMemory(&IpSnmpInfo, sizeof(IpSnmpInfo)); + + ZeroMemory(&Request, sizeof(Request)); + Request.ID.toi_entity = Id; + Request.ID.toi_class = INFO_CLASS_PROTOCOL; + Request.ID.toi_type = INFO_TYPE_PROVIDER; + Request.ID.toi_id = IP_MIB_STATS_ID; + + Result = DeviceIoControl( + TcpFileHandle, + IOCTL_TCP_QUERY_INFORMATION_EX, + &Request, + sizeof(Request), + &IpSnmpInfo, + sizeof(IpSnmpInfo), + &BufferSize, + NULL); + ok(Result, "DeviceIoControl failed.\n"); + + /* Dump it */ + indent_printf("IP_MIB Statistics:\n"); + IndentationLevel++; + indent_printf("ipsi_forwarding: %lu\n", IpSnmpInfo.ipsi_forwarding); + indent_printf("ipsi_defaultttl: %lu\n", IpSnmpInfo.ipsi_defaultttl); + indent_printf("ipsi_inreceives: %lu\n", IpSnmpInfo.ipsi_inreceives); + indent_printf("ipsi_inhdrerrors: %lu\n", IpSnmpInfo.ipsi_inhdrerrors); + indent_printf("ipsi_inaddrerrors: %lu\n", IpSnmpInfo.ipsi_inaddrerrors); + indent_printf("ipsi_forwdatagrams: %lu\n", IpSnmpInfo.ipsi_forwdatagrams); + indent_printf("ipsi_inunknownprotos: %lu\n", IpSnmpInfo.ipsi_inunknownprotos); + indent_printf("ipsi_indiscards: %lu\n", IpSnmpInfo.ipsi_indiscards); + indent_printf("ipsi_indelivers: %lu\n", IpSnmpInfo.ipsi_indelivers); + indent_printf("ipsi_outrequests: %lu\n", IpSnmpInfo.ipsi_outrequests); + indent_printf("ipsi_routingdiscards: %lu\n", IpSnmpInfo.ipsi_routingdiscards); + indent_printf("ipsi_outdiscards: %lu\n", IpSnmpInfo.ipsi_outdiscards); + indent_printf("ipsi_outnoroutes: %lu\n", IpSnmpInfo.ipsi_outnoroutes); + indent_printf("ipsi_reasmtimeout: %lu\n", IpSnmpInfo.ipsi_reasmtimeout); + indent_printf("ipsi_reasmreqds: %lu\n", IpSnmpInfo.ipsi_reasmreqds); + indent_printf("ipsi_reasmoks: %lu\n", IpSnmpInfo.ipsi_reasmoks); + indent_printf("ipsi_reasmfails: %lu\n", IpSnmpInfo.ipsi_reasmfails); + indent_printf("ipsi_fragoks: %lu\n", IpSnmpInfo.ipsi_fragoks); + indent_printf("ipsi_fragfails: %lu\n", IpSnmpInfo.ipsi_fragfails); + indent_printf("ipsi_fragcreates: %lu\n", IpSnmpInfo.ipsi_fragcreates); + indent_printf("ipsi_numif: %lu\n", IpSnmpInfo.ipsi_numif); + indent_printf("ipsi_numaddr: %lu\n", IpSnmpInfo.ipsi_numaddr); + indent_printf("ipsi_numroutes: %lu\n", IpSnmpInfo.ipsi_numroutes); + + if (IpSnmpInfo.ipsi_numaddr != 0) + { + IPAddrEntry* AddrEntries; + ULONG i; + + AddrEntries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, IpSnmpInfo.ipsi_numaddr * sizeof(AddrEntries[0])); + ok(AddrEntries != NULL, "\n"); + + ZeroMemory(&Request, sizeof(Request)); + Request.ID.toi_entity = Id; + Request.ID.toi_class = INFO_CLASS_PROTOCOL; + Request.ID.toi_type = INFO_TYPE_PROVIDER; + Request.ID.toi_id = IP_MIB_ADDRTABLE_ENTRY_ID; + + Result = DeviceIoControl( + TcpFileHandle, + IOCTL_TCP_QUERY_INFORMATION_EX, + &Request, + sizeof(Request), + AddrEntries, + IpSnmpInfo.ipsi_numaddr * sizeof(AddrEntries[0]), + &BufferSize, + NULL); + ok(Result, "DeviceIoControl failed.\n"); + ok_long(BufferSize, IpSnmpInfo.ipsi_numaddr * sizeof(AddrEntries[0])); + + for(i = 0; i < IpSnmpInfo.ipsi_numaddr; i++) + { + CHAR AddressString[16]; + struct in_addr Addr; + + Addr.S_un.S_addr = AddrEntries[i].iae_addr; + RtlIpv4AddressToStringA(&Addr, AddressString); + + indent_printf("Address %lu: %s\n", i, AddressString); + + IndentationLevel++; + + indent_printf("iae_addr: %lx\n", AddrEntries[i].iae_addr); + indent_printf("iae_index: %lu\n", AddrEntries[i].iae_index); + Addr.S_un.S_addr = AddrEntries[i].iae_mask; + RtlIpv4AddressToStringA(&Addr, AddressString); + indent_printf("iae_mask: %lx (%s)\n", AddrEntries[i].iae_mask, AddressString); + indent_printf("iae_bcastaddr: %lu\n", AddrEntries[i].iae_bcastaddr); + indent_printf("iae_reasmsize: %lu\n", AddrEntries[i].iae_reasmsize); + indent_printf("iae_context: %u\n", AddrEntries[i].iae_context); + + { + IPInterfaceInfo* InterfaceInfo; + + /* Get the interface info */ + BufferSize = sizeof(IPInterfaceInfo) + MAX_PHYSADDR_SIZE; + InterfaceInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, BufferSize); + ok(InterfaceInfo != NULL, "\n"); + + Request.ID.toi_id = IP_INTFC_INFO_ID; + Request.Context[0] = AddrEntries[i].iae_addr; + Result = DeviceIoControl( + TcpFileHandle, + IOCTL_TCP_QUERY_INFORMATION_EX, + &Request, + sizeof(Request), + InterfaceInfo, + BufferSize, + &BufferSize, + NULL); + ok(Result, "DeviceIoControl failed.\n"); + + indent_printf("Interface info:\n"); + IndentationLevel++; + + indent_printf("iii_flags: %lu\n", InterfaceInfo->iii_flags); + indent_printf("iii_mtu : %lu\n", InterfaceInfo->iii_mtu); + indent_printf("iii_speed: %lu\n", InterfaceInfo->iii_speed); + indent_printf("iii_physaddr: %s\n", dbg_print_physaddr(InterfaceInfo->iii_addr, InterfaceInfo->iii_addrlength)); + + IndentationLevel--; + } + + IndentationLevel--; + } + + HeapFree(GetProcessHeap(), 0, AddrEntries); + } + + /* See for the routes */ + if (IpSnmpInfo.ipsi_numroutes) + { + IPRouteEntry* RouteEntries; + ULONG i; + + RouteEntries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, IpSnmpInfo.ipsi_numroutes * sizeof(RouteEntries[0])); + ok(RouteEntries != NULL, "\n"); + + ZeroMemory(&Request, sizeof(Request)); + Request.ID.toi_entity = Id; + Request.ID.toi_class = INFO_CLASS_PROTOCOL; + Request.ID.toi_type = INFO_TYPE_PROVIDER; + Request.ID.toi_id = IP_MIB_ARPTABLE_ENTRY_ID; + + Result = DeviceIoControl( + TcpFileHandle, + IOCTL_TCP_QUERY_INFORMATION_EX, + &Request, + sizeof(Request), + RouteEntries, + IpSnmpInfo.ipsi_numroutes * sizeof(RouteEntries[0]), + &BufferSize, + NULL); + ok(Result, "DeviceIoControl failed.\n"); + ok_long(BufferSize, IpSnmpInfo.ipsi_numroutes * sizeof(RouteEntries[0])); + + for (i = 0; i < IpSnmpInfo.ipsi_numroutes; i++) + { + CHAR AddressString[16]; + struct in_addr Addr; + + Addr.S_un.S_addr = RouteEntries[i].ire_dest; + RtlIpv4AddressToStringA(&Addr, AddressString); + + indent_printf("Route %lu:\n", i); + + IndentationLevel++; + + indent_printf("ire_dest: %s (%lx)\n", AddressString, RouteEntries[i].ire_dest); + indent_printf("ire_index: %lu\n", RouteEntries[i].ire_index); + indent_printf("ire_metric1: %#lx\n", RouteEntries[i].ire_metric1); + indent_printf("ire_metric2: %#lx\n", RouteEntries[i].ire_metric2); + indent_printf("ire_metric3: %#lx\n", RouteEntries[i].ire_metric3); + indent_printf("ire_metric4: %#lx\n", RouteEntries[i].ire_metric4); + Addr.S_un.S_addr = RouteEntries[i].ire_nexthop; + RtlIpv4AddressToStringA(&Addr, AddressString); + indent_printf("ire_nexthop: %s (%lx)\n", AddressString, RouteEntries[i].ire_nexthop); + indent_printf("ire_type: %lu\n", RouteEntries[i].ire_type); + indent_printf("ire_proto: %lu\n", RouteEntries[i].ire_proto); + indent_printf("ire_age: %lu\n", RouteEntries[i].ire_age); + Addr.S_un.S_addr = RouteEntries[i].ire_mask; + RtlIpv4AddressToStringA(&Addr, AddressString); + indent_printf("ire_mask: %s (%lx)\n", AddressString, RouteEntries[i].ire_mask); + indent_printf("ire_metric5: %lx\n", RouteEntries[i].ire_metric5); + indent_printf("ire_context: %lx\n", RouteEntries[i].ire_context); + + IndentationLevel--; + } + } + + IndentationLevel--; +} + +typedef struct ARPInfo +{ + unsigned long ai_numroutes; + unsigned long ai_unknown; +} ARPInfo; + +typedef struct ARPEntry +{ + unsigned long ae_index; + unsigned long ae_physaddrlen; + unsigned char ae_physaddr[MAX_PHYSADDR_SIZE]; + unsigned long ae_address; + unsigned long ae_unknown; +} ARPEntry; + +static +void +test_AT_ARP_STATS( + TDIEntityID Id, + ULONG EntityType) +{ + ARPInfo ArpInfo; + TCP_REQUEST_QUERY_INFORMATION_EX Request; + ULONG BufferSize = 0; + BOOL Result; + + /* Not valid for other entity types */ + if (EntityType != AT_ARP) + return; + + ZeroMemory(&Request, sizeof(Request)); + Request.ID.toi_entity = Id; + Request.ID.toi_class = INFO_CLASS_PROTOCOL; + Request.ID.toi_type = INFO_TYPE_PROVIDER; + Request.ID.toi_id = AT_MIB_ADDRXLAT_INFO_ID; + + Result = DeviceIoControl( + TcpFileHandle, + IOCTL_TCP_QUERY_INFORMATION_EX, + &Request, + sizeof(Request), + &ArpInfo, + sizeof(ArpInfo), + &BufferSize, + NULL); + ok(Result, "DeviceIoControl failed.\n"); + ok_long(BufferSize, sizeof(ArpInfo)); + + indent_printf("ARP Info:\n"); + IndentationLevel++; + + indent_printf("ai_numroutes: %lu\n", ArpInfo.ai_numroutes); + indent_printf("ai_unknown: %lx\n", ArpInfo.ai_unknown); + + if (ArpInfo.ai_numroutes) + { + ARPEntry* ArpEntries; + ULONG i; + + Request.ID.toi_id = AT_MIB_ADDRXLAT_ENTRY_ID; + + ArpEntries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ArpInfo.ai_numroutes * sizeof(ArpEntries[0])); + ok(ArpEntries != NULL, "\n"); + + Result = DeviceIoControl( + TcpFileHandle, + IOCTL_TCP_QUERY_INFORMATION_EX, + &Request, + sizeof(Request), + ArpEntries, + ArpInfo.ai_numroutes * sizeof(ArpEntries[0]), + &BufferSize, + NULL); + ok(Result, "DeviceIoControl failed.\n"); + ok_long(BufferSize, ArpInfo.ai_numroutes * sizeof(ArpEntries[0])); + + for (i = 0; i < ArpInfo.ai_numroutes; i++) + { + CHAR AddressString[16]; + struct in_addr Addr; + + Addr.S_un.S_addr = ArpEntries[i].ae_address; + RtlIpv4AddressToStringA(&Addr, AddressString); + + indent_printf("ARP Entry %lu:\n", i); + + IndentationLevel++; + + indent_printf("ae_index: %lu\n", ArpEntries[i].ae_index); + indent_printf("ae_physaddr: %lu\n", dbg_print_physaddr(ArpEntries[i].ae_physaddr, ArpEntries[i].ae_physaddrlen)); + indent_printf("ae_address: %lx (%s)\n", ArpEntries[i].ae_address, AddressString); + indent_printf("ae_unknown: %lu.\n", ArpEntries[i].ae_unknown); + + IndentationLevel--; + } + + HeapFree(GetProcessHeap(), 0, ArpEntries); + } + + IndentationLevel--; +} + +START_TEST(tcp_info) +{ + TDIEntityID* Entities; + DWORD BufferSize; + BOOL Result; + ULONG i, EntityCount; + TCP_REQUEST_QUERY_INFORMATION_EX Request; + + /* Open a control channel file for TCP */ + TcpFileHandle = CreateFileW( + L"\\\\.\\Tcp", + FILE_READ_DATA | FILE_WRITE_DATA, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + 0, + NULL); + ok(TcpFileHandle != INVALID_HANDLE_VALUE, "CreateFile failed, GLE %lu\n", GetLastError()); + + /* Try the IOCTL */ + BufferSize = 0; + Result = DeviceIoControl( + TcpFileHandle, + IOCTL_TCP_QUERY_INFORMATION_EX, + NULL, + 0, + NULL, + 0, + &BufferSize, + NULL); + ok(!Result, "DeviceIoControl succeeded.\n"); + ok_long(GetLastError(), ERROR_INVALID_PARAMETER); + ok_long(BufferSize, 0); + + ZeroMemory(&Request, sizeof(Request)); + Request.ID.toi_entity.tei_entity = GENERIC_ENTITY; + Request.ID.toi_entity.tei_instance = 0; + Request.ID.toi_class = INFO_CLASS_GENERIC; + Request.ID.toi_type = INFO_TYPE_PROVIDER; + Request.ID.toi_id = ENTITY_LIST_ID; + + BufferSize = 0; + Result = DeviceIoControl( + TcpFileHandle, + IOCTL_TCP_QUERY_INFORMATION_EX, + &Request, + sizeof(Request), + NULL, + 0, + &BufferSize, + NULL); + ok(!Result, "DeviceIoControl succeeded.\n"); + ok_long(GetLastError(), ERROR_INVALID_PARAMETER); + ok_long(BufferSize, 0); + + BufferSize = 4 * sizeof(Entities[0]); + Entities = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, BufferSize); + ok(Entities != NULL, "\n"); + + while (TRUE) + { + Result = DeviceIoControl( + TcpFileHandle, + IOCTL_TCP_QUERY_INFORMATION_EX, + &Request, + sizeof(Request), + Entities, + BufferSize, + &BufferSize, + NULL); + + if (Result) + break; + + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + break; + + BufferSize *= 2; + Entities = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Entities, BufferSize); + ok(Entities != NULL, "\n"); + } + + ok(Result, "DeviceIoControl failed!\n"); + EntityCount = BufferSize / sizeof(Entities[0]); + trace("Got %lu entities.\n", EntityCount); + + for (i = 0; i < EntityCount; i++) + { + ULONG EntityType; + + /* Get the type */ + Request.ID.toi_entity = Entities[i]; + Request.ID.toi_class = INFO_CLASS_GENERIC; + Request.ID.toi_type = INFO_TYPE_PROVIDER; + Request.ID.toi_id = ENTITY_TYPE_ID; + + Result = DeviceIoControl( + TcpFileHandle, + IOCTL_TCP_QUERY_INFORMATION_EX, + &Request, + sizeof(Request), + &EntityType, + sizeof(EntityType), + &BufferSize, + NULL); + ok(Result, "DeviceIoControl failed.\n"); + + printf("Entity %lu: %#lx, %#lx, type %#lx\n", i, Entities[i].tei_entity, Entities[i].tei_instance, EntityType); + test_IF_MIB_STATS(Entities[i], EntityType); + test_IP_MIB_STATS(Entities[i], EntityType); + test_AT_ARP_STATS(Entities[i], EntityType); + } + + HeapFree(GetProcessHeap(), 0, Entities); + CloseHandle(TcpFileHandle); +} Propchange: trunk/rostests/drivers/tcpip/tcp_info.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/drivers/tcpip/tcp_info.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rostests/drivers/tcpip/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/testlist.c?… ============================================================================== --- trunk/rostests/drivers/tcpip/testlist.c [iso-8859-1] (original) +++ trunk/rostests/drivers/tcpip/testlist.c [iso-8859-1] Wed Jan 21 15:55:00 2015 @@ -4,10 +4,12 @@ #include <apitest.h> extern void func_InterfaceInfo(void); +extern void func_tcp_info(void); const struct test winetest_testlist[] = { { "InterfaceInfo", func_InterfaceInfo }, + { "tcp_info", func_tcp_info }, { 0, 0 } };

9 years, 11 months

[ekohl] 66069: [NETCFGX][SYSSETUP] - Move TCP/IP driver setup code from netcfgx to syssetup. - Implement SetupStartService(). This installs the TCPIP driver even if no network adapter is available....

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jan 20 20:57:58 2015 New Revision: 66069 URL: http://svn.reactos.org/svn/reactos?rev=66069&view=rev Log: [NETCFGX][SYSSETUP] - Move TCP/IP driver setup code from netcfgx to syssetup. - Implement SetupStartService(). This installs the TCPIP driver even if no network adapter is available. CORE-8420 #resolve Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/syssetup.spec Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.c [iso-8859-1] Tue Jan 20 20:57:58 2015 @@ -219,106 +219,6 @@ return rc; } -/* Install a section of a .inf file - * Returns TRUE if success, FALSE if failure. Error code can - * be retrieved with GetLastError() - */ -static -BOOL -InstallInfSection( - IN HWND hWnd, - IN LPCWSTR InfFile, - IN LPCWSTR InfSection OPTIONAL, - IN LPCWSTR InfService OPTIONAL) -{ - WCHAR Buffer[MAX_PATH]; - HINF hInf = INVALID_HANDLE_VALUE; - UINT BufferSize; - PVOID Context = NULL; - BOOL ret = FALSE; - - /* Get Windows directory */ - BufferSize = MAX_PATH - 5 - wcslen(InfFile); - if (GetWindowsDirectoryW(Buffer, BufferSize) > BufferSize) - { - /* Function failed */ - SetLastError(ERROR_GEN_FAILURE); - goto cleanup; - } - /* We have enough space to add some information in the buffer */ - if (Buffer[wcslen(Buffer) - 1] != '\\') - wcscat(Buffer, L"\\"); - wcscat(Buffer, L"Inf\\"); - wcscat(Buffer, InfFile); - - /* Install specified section */ - hInf = SetupOpenInfFileW(Buffer, NULL, INF_STYLE_WIN4, NULL); - if (hInf == INVALID_HANDLE_VALUE) - goto cleanup; - - Context = SetupInitDefaultQueueCallback(hWnd); - if (Context == NULL) - goto cleanup; - - ret = TRUE; - if (ret && InfSection) - { - ret = SetupInstallFromInfSectionW( - hWnd, hInf, - InfSection, SPINST_ALL, - NULL, NULL, SP_COPY_NEWER, - SetupDefaultQueueCallbackW, Context, - NULL, NULL); - } - if (ret && InfService) - { - ret = SetupInstallServicesFromInfSectionW( - hInf, InfService, 0); - } - -cleanup: - if (Context) - SetupTermDefaultQueueCallback(Context); - if (hInf != INVALID_HANDLE_VALUE) - SetupCloseInfFile(hInf); - return ret; -} - -/* Add default services for network cards */ -static -DWORD -InstallAdditionalServices( - IN HWND hWnd) -{ - BOOL ret; - UNICODE_STRING TcpipServicePath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Tcpip"); - - /* Install TCP/IP protocol */ - ret = InstallInfSection(hWnd, - L"nettcpip.inf", - L"MS_TCPIP.PrimaryInstall", - L"MS_TCPIP.PrimaryInstall.Services"); - if (!ret && GetLastError() != ERROR_FILE_NOT_FOUND) - { - DPRINT("InstallInfSection() failed with error 0x%lx\n", GetLastError()); - return GetLastError(); - } - else if (ret) - { - /* Start the TCP/IP driver */ - ret = NtLoadDriver(&TcpipServicePath); - if (ret) - { - /* This isn't really fatal but we want to warn anyway */ - DPRINT1("NtLoadDriver(TCPIP) failed with NTSTATUS 0x%lx\n", (NTSTATUS)ret); - } - } - - - /* You can add here more clients (SMB...) and services (DHCP server...) */ - - return ERROR_SUCCESS; -} static DWORD @@ -586,14 +486,6 @@ if (rc != ERROR_SUCCESS) { DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); - goto cleanup; - } - - /* Install additionnal services */ - rc = InstallAdditionalServices(NULL); - if (rc != ERROR_SUCCESS) - { - DPRINT("InstallAdditionalServices() failed with error 0x%lx\n", rc); goto cleanup; } Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Tue Jan 20 20:57:58 2015 @@ -43,6 +43,9 @@ DWORD WINAPI CMP_WaitNoPendingInstallEvents(DWORD dwTimeout); +DWORD WINAPI +SetupStartService(LPCWSTR lpServiceName, BOOL bWait); + /* GLOBALS ******************************************************************/ HINF hSysSetupInf = INVALID_HANDLE_VALUE; @@ -843,6 +846,72 @@ return TRUE; } +/* Install a section of a .inf file + * Returns TRUE if success, FALSE if failure. Error code can + * be retrieved with GetLastError() + */ +static +BOOL +InstallInfSection( + IN HWND hWnd, + IN LPCWSTR InfFile, + IN LPCWSTR InfSection OPTIONAL, + IN LPCWSTR InfService OPTIONAL) +{ + WCHAR Buffer[MAX_PATH]; + HINF hInf = INVALID_HANDLE_VALUE; + UINT BufferSize; + PVOID Context = NULL; + BOOL ret = FALSE; + + /* Get Windows directory */ + BufferSize = MAX_PATH - 5 - wcslen(InfFile); + if (GetWindowsDirectoryW(Buffer, BufferSize) > BufferSize) + { + /* Function failed */ + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + /* We have enough space to add some information in the buffer */ + if (Buffer[wcslen(Buffer) - 1] != '\\') + wcscat(Buffer, L"\\"); + wcscat(Buffer, L"Inf\\"); + wcscat(Buffer, InfFile); + + /* Install specified section */ + hInf = SetupOpenInfFileW(Buffer, NULL, INF_STYLE_WIN4, NULL); + if (hInf == INVALID_HANDLE_VALUE) + goto cleanup; + + Context = SetupInitDefaultQueueCallback(hWnd); + if (Context == NULL) + goto cleanup; + + ret = TRUE; + if (ret && InfSection) + { + ret = SetupInstallFromInfSectionW( + hWnd, hInf, + InfSection, SPINST_ALL, + NULL, NULL, SP_COPY_NEWER, + SetupDefaultQueueCallbackW, Context, + NULL, NULL); + } + if (ret && InfService) + { + ret = SetupInstallServicesFromInfSectionW( + hInf, InfService, 0); + } + +cleanup: + if (Context) + SetupTermDefaultQueueCallback(Context); + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); + return ret; +} + + DWORD WINAPI InstallReactOS(HINSTANCE hInstance) { @@ -851,6 +920,7 @@ TOKEN_PRIVILEGES privs; HKEY hKey; HINF hShortcutsInf; + BOOL ret; InitializeSetupActionLog(FALSE); LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS"); @@ -893,6 +963,22 @@ _tcscat(szBuffer, _T("system")); CreateDirectory(szBuffer, NULL); } + + /* Hack: Install TCP/IP protocol driver */ + ret = InstallInfSection(NULL, + L"nettcpip.inf", + L"MS_TCPIP.PrimaryInstall", + L"MS_TCPIP.PrimaryInstall.Services"); + if (!ret && GetLastError() != ERROR_FILE_NOT_FOUND) + { + DPRINT("InstallInfSection() failed with error 0x%lx\n", GetLastError()); + } + else + { + /* Start the TCP/IP protocol driver */ + SetupStartService(L"Tcpip", FALSE); + } + if (!CommonInstall()) return 0; @@ -1039,3 +1125,48 @@ { return SetupChangeLocaleEx(hWnd, Lcid, NULL, 0, 0, 0); } + + +DWORD +WINAPI +SetupStartService( + LPCWSTR lpServiceName, + BOOL bWait) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + DWORD dwError = ERROR_SUCCESS; + + hManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); + if (hManager == NULL) + { + dwError = GetLastError(); + goto done; + } + + hService = OpenServiceW(hManager, + lpServiceName, + SERVICE_START); + if (hService == NULL) + { + dwError = GetLastError(); + goto done; + } + + if (!StartService(hService, 0, NULL)) + { + dwError = GetLastError(); + goto done; + } + +done: + if (hService != NULL) + CloseServiceHandle(hService); + + if (hManager != NULL) + CloseServiceHandle(hManager); + + return dwError; +} Modified: trunk/reactos/dll/win32/syssetup/syssetup.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] Tue Jan 20 20:57:58 2015 @@ -72,7 +72,7 @@ @ stub SetupSetRegisteredOsComponentsOrder @ stub SetupSetSetupInfo @ stub SetupShellSettings -@ stub SetupStartService +@ stdcall SetupStartService(wstr long) @ stub SetupUnregisterOsComponent @ stub StorageCoInstaller @ stub SystemUpdateUserProfileDirectory

9 years, 11 months

[tkreuzer] 66068: [SPEC2DEF] Fix generation of ARM assembly stubs with C++ name mangling. Patch by Yuntian Zhang. CORE-8700 #resolve #comment Committed, thanks.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 20 18:33:33 2015 New Revision: 66068 URL: http://svn.reactos.org/svn/reactos?rev=66068&view=rev Log: [SPEC2DEF] Fix generation of ARM assembly stubs with C++ name mangling. Patch by Yuntian Zhang. CORE-8700 #resolve #comment Committed, thanks. Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Tue Jan 20 18:33:33 2015 @@ -391,7 +391,7 @@ if (giArch == ARCH_ARM) { fprintf(fileDest, - "\tEXPORT %s [FUNC]\n%s\n", + "\tEXPORT |%s| [FUNC]\n|%s|\n", pszSymbolName, pszSymbolName); }

9 years, 11 months

[akhaldi] 66067: [NOTEPAD] * Replace the page setup dialog with a modified copy from comdlg32. Use PageSetupDlg and a hook function to bring the dialog on screen instead of DialogBox and a dialog p...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jan 20 12:12:40 2015 New Revision: 66067 URL: http://svn.reactos.org/svn/reactos?rev=66067&view=rev Log: [NOTEPAD] * Replace the page setup dialog with a modified copy from comdlg32. Use PageSetupDlg and a hook function to bring the dialog on screen instead of DialogBox and a dialog procedure. With this, PageSetupDlg can do most of the work (init the controls for example). * Save the returned hDevMode and hDevNames to two global variables, so we can use them in later calls to page setup and print. * Include header, footer and page margins when saving/loading settings. * Remove printer setup from the file menu (and related code/resources) since it isn't needed anymore. * Brought to you by Ricardo Hanke. CORE-9040 Modified: trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/dialog.h trunk/reactos/base/applications/notepad/lang/bg-BG.rc trunk/reactos/base/applications/notepad/lang/cs-CZ.rc trunk/reactos/base/applications/notepad/lang/da-DK.rc trunk/reactos/base/applications/notepad/lang/de-DE.rc trunk/reactos/base/applications/notepad/lang/el-GR.rc trunk/reactos/base/applications/notepad/lang/en-US.rc trunk/reactos/base/applications/notepad/lang/es-ES.rc trunk/reactos/base/applications/notepad/lang/eu-ES.rc trunk/reactos/base/applications/notepad/lang/fi-FI.rc trunk/reactos/base/applications/notepad/lang/fr-FR.rc trunk/reactos/base/applications/notepad/lang/he-IL.rc trunk/reactos/base/applications/notepad/lang/hu-HU.rc trunk/reactos/base/applications/notepad/lang/hy-AM.rc trunk/reactos/base/applications/notepad/lang/id-ID.rc trunk/reactos/base/applications/notepad/lang/it-IT.rc trunk/reactos/base/applications/notepad/lang/ja-JP.rc trunk/reactos/base/applications/notepad/lang/lt-LT.rc trunk/reactos/base/applications/notepad/lang/nl-NL.rc trunk/reactos/base/applications/notepad/lang/no-NO.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/pt-BR.rc trunk/reactos/base/applications/notepad/lang/pt-PT.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/sk-SK.rc trunk/reactos/base/applications/notepad/lang/sl-SI.rc trunk/reactos/base/applications/notepad/lang/sq-AL.rc trunk/reactos/base/applications/notepad/lang/sv-SE.rc trunk/reactos/base/applications/notepad/lang/th-TH.rc trunk/reactos/base/applications/notepad/lang/tr-TR.rc trunk/reactos/base/applications/notepad/lang/uk-UA.rc trunk/reactos/base/applications/notepad/lang/uz-UZ.rc trunk/reactos/base/applications/notepad/lang/zh-CN.rc trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/notepad/main.h trunk/reactos/base/applications/notepad/notepad_res.h trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/notepad/settings.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/dialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/notepad_res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/…

9 years, 11 months

[tkreuzer] 66066: [WIN32K] Remove broken ASSERT CORE-9033 #resolve See issue #9033 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 19 23:24:07 2015 New Revision: 66066 URL: http://svn.reactos.org/svn/reactos?rev=66066&view=rev Log: [WIN32K] Remove broken ASSERT CORE-9033 #resolve See issue #9033 for more details. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Mon Jan 19 23:24:07 2015 @@ -1111,7 +1111,6 @@ DWORD rop2Fg; MIX mix; NT_ASSERT((pdc != NULL) && (prgn != NULL)); - ASSERT_DC_PREPARED(pdc); if (pdc->dclevel.pSurface == NULL) {

9 years, 11 months

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2015