Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[tfaber] 54304: [MSHTML][SHDOCVW] - Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext. Fixes explorer "Web" button assert. Already applied upstream. See issue #6011 for more d...
by tfaber＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: tfaber Date: Sat Nov 5 20:40:59 2011 New Revision: 54304 URL: http://svn.reactos.org/svn/reactos?rev=54304&view=rev Log: [MSHTML][SHDOCVW] - Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext. Fixes explorer "Web" button assert. Already applied upstream. See issue #6011 for more details. Modified: trunk/reactos/dll/win32/mshtml/view.c trunk/reactos/dll/win32/shdocvw/client.c trunk/reactos/dll/win32/shdocvw/oleobject.c Modified: trunk/reactos/dll/win32/mshtml/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/view.c?re… ============================================================================== --- trunk/reactos/dll/win32/mshtml/view.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/view.c [iso-8859-1] Sat Nov 5 20:40:59 2011 @@ -259,6 +259,7 @@ return FAILED(hres) ? hres : E_FAIL; } + frameinfo.cb = sizeof(OLEINPLACEFRAMEINFO); hres = IOleInPlaceSite_GetWindowContext(This->ipsite, &pIPFrame, &This->ip_window, &posrect, &cliprect, &frameinfo); if(FAILED(hres)) { Modified: trunk/reactos/dll/win32/shdocvw/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/client.c… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/client.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/client.c [iso-8859-1] Sat Nov 5 20:40:59 2011 @@ -227,7 +227,6 @@ GetClientRect(This->hwnd, lprcPosRect); *lprcClipRect = *lprcPosRect; - lpFrameInfo->cb = sizeof(*lpFrameInfo); lpFrameInfo->fMDIApp = FALSE; lpFrameInfo->hwndFrame = This->frame_hwnd; lpFrameInfo->haccel = NULL; Modified: trunk/reactos/dll/win32/shdocvw/oleobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/oleobjec… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/oleobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/oleobject.c [iso-8859-1] Sat Nov 5 20:40:59 2011 @@ -141,6 +141,7 @@ IOleInPlaceSite_OnInPlaceActivate(This->inplace); + This->frameinfo.cb = sizeof(OLEINPLACEFRAMEINFO); IOleInPlaceSite_GetWindowContext(This->inplace, &This->doc_host.frame, &This->uiwindow, &This->pos_rect, &This->clip_rect, &This->frameinfo);

1 0

[cmihail] 54303: [shell32] - Fix a few more winetests in shlfolder tests.
by cmihail＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: cmihail Date: Sat Nov 5 20:09:30 2011 New Revision: 54303 URL: http://svn.reactos.org/svn/reactos?rev=54303&view=rev Log: [shell32] - Fix a few more winetests in shlfolder tests. Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sat Nov 5 20:09:30 2011 @@ -426,7 +426,6 @@ if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) { *pdwAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); - *pdwAttributes &= ~SFGAO_CANLINK; } else *pdwAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR);

1 0

[cgutman] 54302: [LWIP] - Properly sync to lwIP 1.4.0 - No code changes (except unit tests)
by cgutman＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: cgutman Date: Sat Nov 5 18:54:49 2011 New Revision: 54302 URL: http://svn.reactos.org/svn/reactos?rev=54302&view=rev Log: [LWIP] - Properly sync to lwIP 1.4.0 - No code changes (except unit tests) Modified: trunk/reactos/lib/drivers/lwip/CHANGELOG trunk/reactos/lib/drivers/lwip/UPGRADING trunk/reactos/lib/drivers/lwip/doc/rawapi.txt trunk/reactos/lib/drivers/lwip/doc/sys_arch.txt trunk/reactos/lib/drivers/lwip/src/core/tcp_in.c trunk/reactos/lib/drivers/lwip/test/unit/lwip_check.h trunk/reactos/lib/drivers/lwip/test/unit/lwip_unittests.c trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.c trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.h trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp.c trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c trunk/reactos/lib/drivers/lwip/test/unit/udp/test_udp.c Modified: trunk/reactos/lib/drivers/lwip/CHANGELOG URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/CHANGELOG… ============================================================================== --- trunk/reactos/lib/drivers/lwip/CHANGELOG [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/CHANGELOG [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -1,17 +1,28 @@ -FUTURE - - * TODO: The lwIP source code makes some invalid assumptions on processor - word-length, storage sizes and alignment. See the mailing lists for - problems with exoteric (/DSP) architectures showing these problems. - We still have to fix some of these issues neatly. - HISTORY (CVS HEAD) * [Enter new changes just after this line - do not remove this line] + ++ New features: + + + ++ Bugfixes: + + + + +(STABLE-1.4.0) + ++ New features: + + 2011-03-27: Simon Goldschmidt + * tcp_impl.h, tcp_in.c, tcp_out.c: Removed 'dataptr' from 'struct tcp_seg' and + calculate it in tcp_zero_window_probe (the only place where it was used). + + 2010-11-21: Simon Goldschmidt + * dhcp.c/.h: Added a function to deallocate the struct dhcp from a netif + (fixes bug #31525). 2010-07-12: Simon Goldschmidt (patch by Stephane Lesage) * ip.c, udp.c/.h, pbuf.h, sockets.c: task #10495: Added support for @@ -228,6 +239,137 @@ ++ Bugfixes: + + 2011-04-20: Simon Goldschmidt + * sys_arch.txt: sys_arch_timeouts() is not needed any more. + + 2011-04-13: Simon Goldschmidt + * tcp.c, udp.c: Fixed bug #33048 (Bad range for IP source port numbers) by + using ports in the IANA private/dynamic range (49152 through 65535). + + 2011-03-29: Simon Goldschmidt, patch by Emil Lhungdahl: + * etharp.h/.c: Fixed broken VLAN support. + + 2011-03-27: Simon Goldschmidt + * tcp.c: Fixed bug #32926 (TCP_RMV(&tcp_bound_pcbs) is called on unbound tcp + pcbs) by checking if the pcb was bound (local_port != 0). + + 2011-03-27: Simon Goldschmidt + * ppp.c: Fixed bug #32280 (ppp: a pbuf is freed twice) + + 2011-03-27: Simon Goldschmidt + * sockets.c: Fixed bug #32906: lwip_connect+lwip_send did not work for udp and + raw pcbs with LWIP_TCPIP_CORE_LOCKING==1. + + 2011-03-27: Simon Goldschmidt + * tcp_out.c: Fixed bug #32820 (Outgoing TCP connections created before route + is present never times out) by starting retransmission timer before checking + route. + + 2011-03-22: Simon Goldschmidt + * ppp.c: Fixed bug #32648 (PPP code crashes when terminating a link) by only + calling sio_read_abort() if the file descriptor is valid. + + 2011-03-14: Simon Goldschmidt + * err.h/.c, sockets.c, api_msg.c: fixed bug #31748 (Calling non-blocking connect + more than once can render a socket useless) since it mainly involves changing + "FATAL" classification of error codes: ERR_USE and ERR_ISCONN just aren't fatal. + + 2011-03-13: Simon Goldschmidt + * sockets.c: fixed bug #32769 (ESHUTDOWN is linux-specific) by fixing + err_to_errno_table (ERR_CLSD: ENOTCONN instead of ESHUTDOWN), ERR_ISCONN: + use EALRADY instead of -1 + + 2011-03-13: Simon Goldschmidt + * api_lib.c: netconn_accept: return ERR_ABRT instead of ERR_CLSD if the + connection has been aborted by err_tcp (since this is not a normal closing + procedure). + + 2011-03-13: Simon Goldschmidt + * tcp.c: tcp_bind: return ERR_VAL instead of ERR_ISCONN when trying to bind + with pcb->state != CLOSED + + 2011-02-17: Simon Goldschmidt + * rawapi.txt: Fixed bug #32561 tcp_poll argument definition out-of-order in + documentation + + 2011-02-17: Simon Goldschmidt + * many files: Added missing U/UL modifiers to fix 16-bit-arch portability. + + 2011-01-24: Simon Goldschmidt + * sockets.c: Fixed bug #31741: lwip_select seems to have threading problems + + 2010-12-02: Simon Goldschmidt + * err.h: Fixed ERR_IS_FATAL so that ERR_WOULDBLOCK is not fatal. + + 2010-11-23: Simon Goldschmidt + * api.h, api_lib.c, api_msg.c, sockets.c: netconn.recv_avail is only used for + LWIP_SO_RCVBUF and ioctl/FIONREAD. + + 2010-11-23: Simon Goldschmidt + * etharp.c: Fixed bug #31720: ARP-queueing: RFC 1122 recommends to queue at + least 1 packet -> ARP_QUEUEING==0 now queues the most recent packet. + + 2010-11-23: Simon Goldschmidt + * tcp_in.c: Fixed bug #30577: tcp_input: don't discard ACK-only packets after + refusing 'refused_data' again. + + 2010-11-22: Simon Goldschmidt + * sockets.c: Fixed bug #31590: getsockopt(... SO_ERROR ...) gives EINPROGRESS + after a successful nonblocking connection. + + 2010-11-22: Simon Goldschmidt + * etharp.c: Fixed bug #31722: IP packets sent with an AutoIP source addr + must be sent link-local + + 2010-11-22: Simon Goldschmidt + * timers.c: patch #7329: tcp_timer_needed prototype was ifdef'ed out for + LWIP_TIMERS==0 + + 2010-11-20: Simon Goldschmidt + * sockets.c: Fixed bug #31170: lwip_setsockopt() does not set socket number + + 2010-11-20: Simon Goldschmidt + * sockets.h: Fixed bug #31304: Changed SHUT_RD, SHUT_WR and SHUT_RDWR to + resemble other stacks. + + 2010-11-20: Simon Goldschmidt + * dns.c: Fixed bug #31535: TCP_SND_QUEUELEN must be at least 2 or else + no-copy TCP writes will never succeed. + + 2010-11-20: Simon Goldschmidt + * dns.c: Fixed bug #31701: Error return value from dns_gethostbyname() does + not match documentation: return ERR_ARG instead of ERR_VAL if not + initialized or wrong argument. + + 2010-10-20: Simon Goldschmidt + * sockets.h: Fixed bug #31385: sizeof(struct sockaddr) is 30 but should be 16 + + 2010-10-05: Simon Goldschmidt + * dhcp.c: Once again fixed #30038: DHCP/AutoIP cooperation failed when + replugging the network cable after an AutoIP address was assigned. + + 2010-08-10: Simon Goldschmidt + * tcp.c: Fixed bug #30728: tcp_new_port() did not check listen pcbs + + 2010-08-03: Simon Goldschmidt + * udp.c, raw.c: Don't chain empty pbufs when sending them (fixes bug #30625) + + 2010-08-01: Simon Goldschmidt (patch by Greg Renda) + * ppp.c: Applied patch #7264 (PPP protocols are rejected incorrectly on big + endian architectures) + + 2010-07-28: Simon Goldschmidt + * api_lib.c, api_msg.c, sockets.c, mib2.c: Fixed compilation with TCP or UDP + disabled. + + 2010-07-27: Simon Goldschmidt + * tcp.c: Fixed bug #30565 (tcp_connect() check bound list): that check did no + harm but never did anything + + 2010-07-21: Simon Goldschmidt + * ip.c: Fixed invalid fix for bug #30402 (CHECKSUM_GEN_IP_INLINE does not + add IP options) 2010-07-16: Kieran Mansley * msg_in.c: Fixed SNMP ASN constant defines to not use ! operator Modified: trunk/reactos/lib/drivers/lwip/UPGRADING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/UPGRADING… ============================================================================== --- trunk/reactos/lib/drivers/lwip/UPGRADING [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/UPGRADING [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -111,11 +111,16 @@ * Added const char* name to mem- and memp-stats for easier debugging. * Calculate the TCP/UDP checksum while copying to only fetch data once: - Define LWIP_CHKSUM_COPY to a memcpy-like function that returns the checksum + Define LWIP_CHKSUM_COPY to a memcpy-like function that returns the checksum * Added SO_REUSE_RXTOALL to pass received UDP broadcast/multicast packets to more than one pcb. + * Changed the semantics of ARP_QUEUEING==0: ARP_QUEUEING now cannot be turned + off any more, if this is set to 0, only one packet (the most recent one) is + queued (like demanded by RFC 1122). + + ++ Major bugfixes/improvements * Implemented tcp_shutdown() to only shut down one end of a connection Modified: trunk/reactos/lib/drivers/lwip/doc/rawapi.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/doc/rawap… ============================================================================== --- trunk/reactos/lib/drivers/lwip/doc/rawapi.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/doc/rawapi.txt [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -251,8 +251,9 @@ the application may use the polling functionality to call tcp_write() again when the connection has been idle for a while. -- void tcp_poll(struct tcp_pcb *pcb, u8_t interval, - err_t (* poll)(void *arg, struct tcp_pcb *tpcb)) +- void tcp_poll(struct tcp_pcb *pcb, + err_t (* poll)(void *arg, struct tcp_pcb *tpcb), + u8_t interval) Specifies the polling interval and the callback function that should be called to poll the application. The interval is specified in Modified: trunk/reactos/lib/drivers/lwip/doc/sys_arch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/doc/sys_a… ============================================================================== --- trunk/reactos/lib/drivers/lwip/doc/sys_arch.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/doc/sys_arch.txt [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -122,18 +122,6 @@ #define sys_arch_mbox_tryfetch(mbox,msg) \ sys_arch_mbox_fetch(mbox,msg,1) although this would introduce unnecessary delays. - -- struct sys_timeouts *sys_arch_timeouts(void) - - Returns a pointer to the per-thread sys_timeouts structure. In lwIP, - each thread has a list of timeouts which is repressented as a linked - list of sys_timeout structures. The sys_timeouts structure holds a - pointer to a linked list of timeouts. This function is called by - the lwIP timeout scheduler and must not return a NULL value. - - In a single thread sys_arch implementation, this function will - simply return a pointer to a global sys_timeouts variable stored in - the sys_arch module. If threads are supported by the underlying operating system and if such functionality is needed in lwIP, the following function will have Modified: trunk/reactos/lib/drivers/lwip/src/core/tcp_in.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -78,20 +78,6 @@ static err_t tcp_listen_input(struct tcp_pcb_listen *pcb); static err_t tcp_timewait_input(struct tcp_pcb *pcb); - -static const char * const tcp_state_str[] = { - "CLOSED", - "LISTEN", - "SYN_SENT", - "SYN_RCVD", - "ESTABLISHED", - "FIN_WAIT_1", - "FIN_WAIT_2", - "CLOSE_WAIT", - "CLOSING", - "LAST_ACK", - "TIME_WAIT" -}; /** * The initial input processing of TCP. It verifies the TCP header, demultiplexes Modified: trunk/reactos/lib/drivers/lwip/test/unit/lwip_check.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/lwip_check.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/lwip_check.h [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -23,7 +23,7 @@ Suite *s = suite_create(name); for(i = 0; i < num_tests; i++) { - // Core test case + /* Core test case */ TCase *tc_core = tcase_create("Core"); if ((setup != NULL) || (teardown != NULL)) { tcase_add_checked_fixture(tc_core, setup, teardown); Modified: trunk/reactos/lib/drivers/lwip/test/unit/lwip_unittests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/lwip_unittests.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/lwip_unittests.c [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -3,6 +3,8 @@ #include "udp/test_udp.h" #include "tcp/test_tcp.h" #include "tcp/test_tcp_oos.h" +#include "core/test_mem.h" +#include "etharp/test_etharp.h" #include "lwip/init.h" @@ -16,6 +18,8 @@ udp_suite, tcp_suite, tcp_oos_suite, + mem_suite, + etharp_suite, }; size_t num = sizeof(suites)/sizeof(void*); LWIP_ASSERT("No suites defined", num > 0); Modified: trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.c [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -1,6 +1,6 @@ #include "tcp_helper.h" -#include "lwip/tcp.h" +#include "lwip/tcp_impl.h" #include "lwip/stats.h" #include "lwip/pbuf.h" #include "lwip/inet_chksum.h" @@ -27,7 +27,6 @@ void tcp_remove_all(void) { - //tcp_remove(tcp_bound_pcbs); tcp_remove(tcp_listen_pcbs.pcbs); tcp_remove(tcp_active_pcbs); tcp_remove(tcp_tw_pcbs); @@ -51,14 +50,14 @@ /** Create a TCP segment usable for passing to tcp_input */ struct pbuf* -tcp_create_segment(struct ip_addr* src_ip, struct ip_addr* dst_ip, +tcp_create_segment(ip_addr_t* src_ip, ip_addr_t* dst_ip, u16_t src_port, u16_t dst_port, void* data, size_t data_len, u32_t seqno, u32_t ackno, u8_t headerflags) { struct pbuf* p; struct ip_hdr* iphdr; struct tcp_hdr* tcphdr; - u16_t pbuf_len = sizeof(struct ip_hdr) + sizeof(struct tcp_hdr) + data_len; + u16_t pbuf_len = (u16_t)(sizeof(struct ip_hdr) + sizeof(struct tcp_hdr) + data_len); p = pbuf_alloc(PBUF_RAW, pbuf_len, PBUF_POOL); EXPECT_RETNULL(p != NULL); @@ -83,13 +82,14 @@ tcphdr->ackno = htonl(ackno); TCPH_HDRLEN_SET(tcphdr, sizeof(struct tcp_hdr)/4); TCPH_FLAGS_SET(tcphdr, headerflags); - tcphdr->wnd = htonl(TCP_WND); + tcphdr->wnd = htons(TCP_WND); /* copy data */ memcpy((char*)tcphdr + sizeof(struct tcp_hdr), data, data_len); /* calculate checksum */ - tcphdr->chksum = inet_chksum_pseudo(p, &(iphdr->src), &(iphdr->dest), + + tcphdr->chksum = inet_chksum_pseudo(p, src_ip, dst_ip, IP_PROTO_TCP, p->tot_len); pbuf_header(p, sizeof(struct ip_hdr)); @@ -99,8 +99,8 @@ /** Safely bring a tcp_pcb into the requested state */ void -tcp_set_state(struct tcp_pcb* pcb, enum tcp_state state, struct ip_addr* local_ip, - struct ip_addr* remote_ip, u16_t local_port, u16_t remote_port) +tcp_set_state(struct tcp_pcb* pcb, enum tcp_state state, ip_addr_t* local_ip, + ip_addr_t* remote_ip, u16_t local_port, u16_t remote_port) { /* @todo: are these all states? */ /* @todo: remove from previous list */ @@ -194,3 +194,20 @@ } return pcb; } + +/** Calls tcp_input() after adjusting current_iphdr_dest */ +void test_tcp_input(struct pbuf *p, struct netif *inp) +{ + struct ip_hdr *iphdr = (struct ip_hdr*)p->payload; + ip_addr_copy(current_iphdr_dest, iphdr->dest); + ip_addr_copy(current_iphdr_src, iphdr->src); + current_netif = inp; + current_header = iphdr; + + tcp_input(p, inp); + + current_iphdr_dest.addr = 0; + current_iphdr_src.addr = 0; + current_netif = NULL; + current_header = NULL; +} Modified: trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.h [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -21,16 +21,18 @@ /* Helper functions */ void tcp_remove_all(void); -struct pbuf* tcp_create_segment(struct ip_addr* src_ip, struct ip_addr* dst_ip, +struct pbuf* tcp_create_segment(ip_addr_t* src_ip, ip_addr_t* dst_ip, u16_t src_port, u16_t dst_port, void* data, size_t data_len, u32_t seqno, u32_t ackno, u8_t headerflags); struct pbuf* tcp_create_rx_segment(struct tcp_pcb* pcb, void* data, size_t data_len, u32_t seqno_offset, u32_t ackno_offset, u8_t headerflags); -void tcp_set_state(struct tcp_pcb* pcb, enum tcp_state state, struct ip_addr* local_ip, - struct ip_addr* remote_ip, u16_t local_port, u16_t remote_port); +void tcp_set_state(struct tcp_pcb* pcb, enum tcp_state state, ip_addr_t* local_ip, + ip_addr_t* remote_ip, u16_t local_port, u16_t remote_port); void test_tcp_counters_err(void* arg, err_t err); err_t test_tcp_counters_recv(void* arg, struct tcp_pcb* pcb, struct pbuf* p, err_t err); struct tcp_pcb* test_tcp_new_counters_pcb(struct test_tcp_counters* counters); +void test_tcp_input(struct pbuf *p, struct netif *inp); + #endif Modified: trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp.c [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -1,6 +1,6 @@ #include "test_tcp.h" -#include "lwip/tcp.h" +#include "lwip/tcp_impl.h" #include "lwip/stats.h" #include "tcp_helper.h" @@ -50,7 +50,7 @@ struct tcp_pcb* pcb; struct pbuf* p; char data[] = {1, 2, 3, 4}; - struct ip_addr remote_ip, local_ip; + ip_addr_t remote_ip, local_ip; u16_t data_len; u16_t remote_port = 0x100, local_port = 0x101; struct netif netif; @@ -76,7 +76,7 @@ EXPECT(p != NULL); if (p != NULL) { /* pass the segment to tcp_input */ - tcp_input(p, &netif); + test_tcp_input(p, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 1); Modified: trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -1,6 +1,6 @@ #include "test_tcp_oos.h" -#include "lwip/tcp.h" +#include "lwip/tcp_impl.h" #include "lwip/stats.h" #include "tcp_helper.h" @@ -60,7 +60,7 @@ return 0; } -/** Get the tcplen of a segment (by index) on the ooseq list +/** Get the tcplen (datalen + SYN/FIN) of a segment (by index) on the ooseq list * * @param pcb the pcb to check for ooseq segments * @param seg_index index of the segment on the ooseq list @@ -82,6 +82,25 @@ } fail(); return -1; +} + +/** Get the tcplen (datalen + SYN/FIN) of all segments on the ooseq list + * + * @param pcb the pcb to check for ooseq segments + * @return tcplen of all segment + */ +static int +tcp_oos_tcplen(struct tcp_pcb* pcb) +{ + int len = 0; + struct tcp_seg* seg = pcb->ooseq; + + /* then check the actual segment */ + while(seg != NULL) { + len += TCP_TCPLEN(seg); + seg = seg->next; + } + return len; } /* Setup/teardown functions */ @@ -115,7 +134,7 @@ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; - struct ip_addr remote_ip, local_ip; + ip_addr_t remote_ip, local_ip; u16_t data_len; u16_t remote_port = 0x100, local_port = 0x101; struct netif netif; @@ -161,7 +180,7 @@ EXPECT(p_fin != NULL); if ((pinseq != NULL) && (p_8_9 != NULL) && (p_4_8 != NULL) && (p_4_10 != NULL) && (p_2_14 != NULL) && (p_fin != NULL)) { /* pass the segment to tcp_input */ - tcp_input(p_8_9, &netif); + test_tcp_input(p_8_9, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); @@ -173,7 +192,7 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 9); /* includes FIN */ /* pass the segment to tcp_input */ - tcp_input(p_4_8, &netif); + test_tcp_input(p_4_8, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); @@ -187,7 +206,7 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 9); /* includes FIN */ /* pass the segment to tcp_input */ - tcp_input(p_4_10, &netif); + test_tcp_input(p_4_10, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); @@ -201,35 +220,31 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 9); /* includes FIN */ /* pass the segment to tcp_input */ - tcp_input(p_2_14, &netif); - /* check if counters are as expected */ - EXPECT(counters.close_calls == 0); - EXPECT(counters.recv_calls == 0); - EXPECT(counters.recved_bytes == 0); - EXPECT(counters.err_calls == 0); - /* check ooseq queue */ - EXPECT_OOSEQ(tcp_oos_count(pcb) == 2); + test_tcp_input(p_2_14, &netif); + /* check if counters are as expected */ + EXPECT(counters.close_calls == 0); + EXPECT(counters.recv_calls == 0); + EXPECT(counters.recved_bytes == 0); + EXPECT(counters.err_calls == 0); + /* check ooseq queue */ + EXPECT_OOSEQ(tcp_oos_count(pcb) == 1); EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 0) == 2); - EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 6); - EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 1) == 8); - EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 9); /* includes FIN */ - - /* pass the segment to tcp_input */ - tcp_input(p_fin, &netif); + EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 15); /* includes FIN */ + + /* pass the segment to tcp_input */ + test_tcp_input(p_fin, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); EXPECT(counters.recved_bytes == 0); EXPECT(counters.err_calls == 0); /* ooseq queue: unchanged */ - EXPECT_OOSEQ(tcp_oos_count(pcb) == 2); + EXPECT_OOSEQ(tcp_oos_count(pcb) == 1); EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 0) == 2); - EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 6); - EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 1) == 8); - EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 9); /* includes FIN */ - - /* pass the segment to tcp_input */ - tcp_input(pinseq, &netif); + EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 15); /* includes FIN */ + + /* pass the segment to tcp_input */ + test_tcp_input(pinseq, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 1); EXPECT(counters.recv_calls == 1); @@ -259,7 +274,7 @@ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; - struct ip_addr remote_ip, local_ip; + ip_addr_t remote_ip, local_ip; u16_t data_len; u16_t remote_port = 0x100, local_port = 0x101; struct netif netif; @@ -315,7 +330,7 @@ if ((pinseq != NULL) && (p_1_2 != NULL) && (p_4_8 != NULL) && (p_3_11 != NULL) && (p_2_12 != NULL) && (p_15_1 != NULL) && (p_15_1a != NULL) && (pinseqFIN != NULL)) { /* pass the segment to tcp_input */ - tcp_input(p_1_2, &netif); + test_tcp_input(p_1_2, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); @@ -327,7 +342,7 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 2); /* pass the segment to tcp_input */ - tcp_input(p_4_8, &netif); + test_tcp_input(p_4_8, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); @@ -341,7 +356,7 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 8); /* pass the segment to tcp_input */ - tcp_input(p_3_11, &netif); + test_tcp_input(p_3_11, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 0); @@ -356,23 +371,21 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 11); /* pass the segment to tcp_input */ - tcp_input(p_2_12, &netif); - /* check if counters are as expected */ - EXPECT(counters.close_calls == 0); - EXPECT(counters.recv_calls == 0); - EXPECT(counters.recved_bytes == 0); - EXPECT(counters.err_calls == 0); - /* check ooseq queue */ - EXPECT_OOSEQ(tcp_oos_count(pcb) == 3); + test_tcp_input(p_2_12, &netif); + /* check if counters are as expected */ + EXPECT(counters.close_calls == 0); + EXPECT(counters.recv_calls == 0); + EXPECT(counters.recved_bytes == 0); + EXPECT(counters.err_calls == 0); + /* check ooseq queue */ + EXPECT_OOSEQ(tcp_oos_count(pcb) == 2); EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 0) == 1); EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 1); EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 1) == 2); - EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 1); - EXPECT_OOSEQ(tcp_oos_seg_seqno(pcb, 2) == 3); - EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 2) == 11); - - /* pass the segment to tcp_input */ - tcp_input(pinseq, &netif); + EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 1) == 12); + + /* pass the segment to tcp_input */ + test_tcp_input(pinseq, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 1); @@ -381,7 +394,7 @@ EXPECT(pcb->ooseq == NULL); /* pass the segment to tcp_input */ - tcp_input(p_15_1, &netif); + test_tcp_input(p_15_1, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 1); @@ -393,7 +406,7 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 1); /* pass the segment to tcp_input */ - tcp_input(p_15_1a, &netif); + test_tcp_input(p_15_1a, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 0); EXPECT(counters.recv_calls == 1); @@ -405,7 +418,7 @@ EXPECT_OOSEQ(tcp_oos_seg_tcplen(pcb, 0) == 1); /* pass the segment to tcp_input */ - tcp_input(pinseqFIN, &netif); + test_tcp_input(pinseqFIN, &netif); /* check if counters are as expected */ EXPECT(counters.close_calls == 1); EXPECT(counters.recv_calls == 2); @@ -421,6 +434,99 @@ } END_TEST +static char data_full_wnd[TCP_WND]; + +/** create multiple segments and pass them to tcp_input with the first segment missing + * to simulate overruning the rxwin with ooseq queueing enabled */ +START_TEST(test_tcp_recv_ooseq_overrun_rxwin) +{ + int i, k; + struct test_tcp_counters counters; + struct tcp_pcb* pcb; + struct pbuf *pinseq, *p_ovr; + ip_addr_t remote_ip, local_ip; + u16_t remote_port = 0x100, local_port = 0x101; + struct netif netif; + int datalen = 0; + int datalen2; + LWIP_UNUSED_ARG(_i); + + for(i = 0; i < sizeof(data_full_wnd); i++) { + data_full_wnd[i] = (char)i; + } + + /* initialize local vars */ + memset(&netif, 0, sizeof(netif)); + IP4_ADDR(&local_ip, 192, 168, 1, 1); + IP4_ADDR(&remote_ip, 192, 168, 1, 2); + /* initialize counter struct */ + memset(&counters, 0, sizeof(counters)); + counters.expected_data_len = TCP_WND; + counters.expected_data = data_full_wnd; + + /* create and initialize the pcb */ + pcb = test_tcp_new_counters_pcb(&counters); + EXPECT_RET(pcb != NULL); + tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); + pcb->rcv_nxt = 0x8000; + + /* create segments */ + /* pinseq is sent as last segment! */ + pinseq = tcp_create_rx_segment(pcb, &data_full_wnd[0], TCP_MSS, 0, 0, TCP_ACK); + + for(i = TCP_MSS, k = 0; i < TCP_WND; i += TCP_MSS, k++) { + int count, expected_datalen; + struct pbuf *p = tcp_create_rx_segment(pcb, &data_full_wnd[TCP_MSS*(k+1)], + TCP_MSS, TCP_MSS*(k+1), 0, TCP_ACK); + EXPECT(p != NULL); + /* pass the segment to tcp_input */ + test_tcp_input(p, &netif); + /* check if counters are as expected */ + EXPECT(counters.close_calls == 0); + EXPECT(counters.recv_calls == 0); + EXPECT(counters.recved_bytes == 0); + EXPECT(counters.err_calls == 0); + /* check ooseq queue */ + count = tcp_oos_count(pcb); + EXPECT_OOSEQ(count == k+1); + datalen = tcp_oos_tcplen(pcb); + if (i + TCP_MSS < TCP_WND) { + expected_datalen = (k+1)*TCP_MSS; + } else { + expected_datalen = TCP_WND - TCP_MSS; + } + if (datalen != expected_datalen) { + EXPECT_OOSEQ(datalen == expected_datalen); + } + } + + /* pass in one more segment, cleary overrunning the rxwin */ + p_ovr = tcp_create_rx_segment(pcb, &data_full_wnd[TCP_MSS*(k+1)], TCP_MSS, TCP_MSS*(k+1), 0, TCP_ACK); + EXPECT(p_ovr != NULL); + /* pass the segment to tcp_input */ + test_tcp_input(p_ovr, &netif); + /* check if counters are as expected */ + EXPECT(counters.close_calls == 0); + EXPECT(counters.recv_calls == 0); + EXPECT(counters.recved_bytes == 0); + EXPECT(counters.err_calls == 0); + /* check ooseq queue */ + EXPECT_OOSEQ(tcp_oos_count(pcb) == k); + datalen2 = tcp_oos_tcplen(pcb); + EXPECT_OOSEQ(datalen == datalen2); + + /* now pass inseq */ + test_tcp_input(pinseq, &netif); + EXPECT(pcb->ooseq == NULL); + + /* make sure the pcb is freed */ + EXPECT(lwip_stats.memp[MEMP_TCP_PCB].used == 1); + tcp_abort(pcb); + EXPECT(lwip_stats.memp[MEMP_TCP_PCB].used == 0); +} +END_TEST + + /** Create the suite including all tests for this module */ Suite * tcp_oos_suite(void) @@ -428,6 +534,7 @@ TFun tests[] = { test_tcp_recv_ooseq_FIN_OOSEQ, test_tcp_recv_ooseq_FIN_INSEQ, + test_tcp_recv_ooseq_overrun_rxwin, }; return create_suite("TCP_OOS", tests, sizeof(tests)/sizeof(TFun), tcp_oos_setup, tcp_oos_teardown); } Modified: trunk/reactos/lib/drivers/lwip/test/unit/udp/test_udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… ============================================================================== --- trunk/reactos/lib/drivers/lwip/test/unit/udp/test_udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/test/unit/udp/test_udp.c [iso-8859-1] Sat Nov 5 18:54:49 2011 @@ -56,17 +56,6 @@ } END_TEST -START_TEST(test_udp_remove) -{ - struct udp_pcb* pcb; - LWIP_UNUSED_ARG(_i); - - pcb = NULL; - //pcb = udp_new(); - //fail_unless(pcb != NULL); -} -END_TEST - /** Create the suite including all tests for this module */ Suite * @@ -74,7 +63,6 @@ { TFun tests[] = { test_udp_new_remove, - test_udp_remove }; return create_suite("UDP", tests, sizeof(tests)/sizeof(TFun), udp_setup, udp_teardown); }

1 0

[akhaldi] 54301: [SHELL32] * Fix rbuild build. * Remove a debug breakpoint that is no longer needed.
by akhaldi＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: akhaldi Date: Sat Nov 5 17:56:10 2011 New Revision: 54301 URL: http://svn.reactos.org/svn/reactos?rev=54301&view=rev Log: [SHELL32] * Fix rbuild build. * Remove a debug breakpoint that is no longer needed. Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Sat Nov 5 17:56:10 2011 @@ -20,6 +20,7 @@ <library>user32</library> <library>comctl32</library> <library>comdlg32</library> + <library>shdocvw</library> <library>shlwapi</library> <library>ole32</library> <library>version</library> Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp [iso-8859-1] Sat Nov 5 17:56:10 2011 @@ -373,7 +373,6 @@ { lstrcpynW(pathPtr, lpszDisplayName, MAX_PATH - (pathPtr - szPath)); hr = _ILCreateFromPathW(szPath, &pidlTemp); - __debugbreak(); } else {

1 0

[cmihail] 54300: [shell32] - Fix ParseDisplayName based on wine by checking for paths that are parsable through IEParseDisplayNameWithBCW. Score 2 failed wine tests in shlfolder
by cmihail＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: cmihail Date: Sat Nov 5 16:40:42 2011 New Revision: 54300 URL: http://svn.reactos.org/svn/reactos?rev=54300&view=rev Log: [shell32] - Fix ParseDisplayName based on wine by checking for paths that are parsable through IEParseDisplayNameWithBCW. Score 2 failed wine tests in shlfolder Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sat Nov 5 16:40:42 2011 @@ -92,6 +92,7 @@ user32 comctl32 comdlg32 + shdocvw shlwapi devmgr winspool @@ -100,6 +101,8 @@ kernel32 ntdll) +add_dependencies(shdocvw shdocvw_v1) + add_pch(shell32 precomp.h) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp [iso-8859-1] Sat Nov 5 16:40:42 2011 @@ -40,6 +40,9 @@ it from the view by handling the IncludeObject query to return S_FALSE. The enumerator always shows My Computer. */ + +/* Undocumented functions from shdocvw */ +extern "C" HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl); /*********************************************************************** * Desktopfolder implementation @@ -296,6 +299,7 @@ WCHAR szElement[MAX_PATH]; LPCWSTR szNext = NULL; LPITEMIDLIST pidlTemp = NULL; + PARSEDURLW urldata; HRESULT hr = S_OK; CLSID clsid; @@ -316,6 +320,8 @@ if (pchEaten) *pchEaten = 0; /* strange but like the original */ + + urldata.cbSize = sizeof(urldata); if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') { @@ -339,6 +345,17 @@ { *ppidl = pidlTemp; return S_OK; + } + else if (SUCCEEDED(ParseURLW(lpszDisplayName, &urldata))) + { + if (urldata.nScheme == URL_SCHEME_SHELL) /* handle shell: urls */ + { + TRACE ("-- shell url: %s\n", debugstr_w(urldata.pszSuffix)); + SHCLSIDFromStringW (urldata.pszSuffix+2, &clsid); + pidlTemp = _ILCreateGuid (PT_GUID, clsid); + } + else + return IEParseDisplayNameWithBCW(CP_ACP,lpszDisplayName,pbc,ppidl); } else { @@ -356,6 +373,7 @@ { lstrcpynW(pathPtr, lpszDisplayName, MAX_PATH - (pathPtr - szPath)); hr = _ILCreateFromPathW(szPath, &pidlTemp); + __debugbreak(); } else {

1 0

[tfaber] 54299: [KERNEL32] - Fix MSVC build
by tfaber＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: tfaber Date: Sat Nov 5 11:39:37 2011 New Revision: 54299 URL: http://svn.reactos.org/svn/reactos?rev=54299&view=rev Log: [KERNEL32] - Fix MSVC build Modified: trunk/reactos/dll/win32/kernel32/client/except.c Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Sat Nov 5 11:39:37 2011 @@ -88,7 +88,7 @@ _dump_context (ContextRecord); _module_name_from_addr(ExceptionRecord->ExceptionAddress, &StartAddr, szMod, sizeof(szMod)); - DbgPrint("Address:\n %8x+%-8x %s\n", + DbgPrint("Address:\n %8x+%-8x %s\n", (PVOID)StartAddr, (ULONG_PTR)ExceptionRecord->ExceptionAddress - (ULONG_PTR)StartAddr, szMod); @@ -242,6 +242,7 @@ ULONG_PTR ErrorParameters[4]; ULONG ErrorResponse; PEXCEPTION_RECORD ExceptionRecord = ExceptionInfo->ExceptionRecord; + LPTOP_LEVEL_EXCEPTION_FILTER RealFilter; if ((NTSTATUS)ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionRecord->NumberParameters >= 2) @@ -278,7 +279,6 @@ return EXCEPTION_CONTINUE_SEARCH; } - LPTOP_LEVEL_EXCEPTION_FILTER RealFilter; RealFilter = RtlDecodePointer(GlobalTopLevelExceptionFilter); if (RealFilter) { @@ -436,7 +436,7 @@ SetUnhandledExceptionFilter(IN LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter) { PVOID EncodedPointer, NewPointer; - + EncodedPointer = RtlEncodePointer(lpTopLevelExceptionFilter); NewPointer = InterlockedExchangePointer(&GlobalTopLevelExceptionFilter, EncodedPointer); @@ -475,7 +475,7 @@ { /* Do an initial probe */ *Current; - + /* Align the addresses */ Current = (volatile CHAR *)ROUND_DOWN(Current, PageSize); Last = (PCHAR)ROUND_DOWN(Last, PageSize); @@ -553,7 +553,7 @@ { /* Do an initial probe */ *Current = *Current; - + /* Align the addresses */ Current = (volatile CHAR *)ROUND_DOWN(Current, PageSize); Last = (PCHAR)ROUND_DOWN(Last, PageSize);

1 0

[tfaber] 54298: [CRT] - Gracefully fail on NULL for gmtime functions. Fixes msvcrt:time crash
by tfaber＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: tfaber Date: Sat Nov 5 10:24:24 2011 New Revision: 54298 URL: http://svn.reactos.org/svn/reactos?rev=54298&view=rev Log: [CRT] - Gracefully fail on NULL for gmtime functions. Fixes msvcrt:time crash Modified: trunk/reactos/lib/sdk/crt/time/gmtime.c Modified: trunk/reactos/lib/sdk/crt/time/gmtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/gmtime.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/gmtime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/gmtime.c [iso-8859-1] Sat Nov 5 10:24:24 2011 @@ -105,20 +105,19 @@ { PTHREADDATA pThreadData; struct tm *ptm; - __time64_t time = *ptime; /* Validate parameters */ - if (time < 0) + if (!ptime || *ptime < 0) { - return 0; + return NULL; } /* Get pointer to TLS tm buffer */ pThreadData = GetThreadData(); ptm = &pThreadData->tmbuf; - /* Use _gmtime_worker to do the ral work */ - return _gmtime_worker(ptm, time, 0); + /* Use _gmtime_worker to do the real work */ + return _gmtime_worker(ptm, *ptime, 0); } /****************************************************************************** @@ -129,7 +128,11 @@ struct tm * _gmtime32(const __time32_t * ptime) { - __time64_t time64 = (__time64_t)*ptime; + __time64_t time64; + + if (!ptime) + return NULL; + time64 = *ptime; return _gmtime64(&time64); } @@ -141,6 +144,10 @@ struct tm * gmtime(const time_t * ptime) { - __time64_t time64 = (__time64_t)*ptime; + __time64_t time64; + + if (!ptime) + return NULL; + time64 = *ptime; return _gmtime64(&time64); }

1 0

[tfaber] 54297: [CRT] - Sync heap.c and undname.c with Wine 1.3.32 - Remove incorrect casts. Undo an incorrect warning fix. Fixes hang in msvcrt:cpp test
by tfaber＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: tfaber Date: Sat Nov 5 10:08:06 2011 New Revision: 54297 URL: http://svn.reactos.org/svn/reactos?rev=54297&view=rev Log: [CRT] - Sync heap.c and undname.c with Wine 1.3.32 - Remove incorrect casts. Undo an incorrect warning fix. Fixes hang in msvcrt:cpp test Modified: trunk/reactos/lib/sdk/crt/wine/heap.c trunk/reactos/lib/sdk/crt/wine/undname.c Modified: trunk/reactos/lib/sdk/crt/wine/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/heap.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/heap.c [iso-8859-1] Sat Nov 5 10:08:06 2011 @@ -35,7 +35,8 @@ ((((DWORD_PTR)((char *)ptr + alignment + sizeof(void *) + offset)) & \ ~(alignment - 1)) - offset)) -typedef void (*MSVCRT_new_handler_func)(size_t size); + +typedef int (CDECL *MSVCRT_new_handler_func)(size_t size); static MSVCRT_new_handler_func MSVCRT_new_handler; static int MSVCRT_new_mode; @@ -50,14 +51,28 @@ */ void* CDECL MSVCRT_operator_new(size_t size) { - void *retval = HeapAlloc(GetProcessHeap(), 0, size); - TRACE("(%ld) returning %p\n", size, retval); - if(retval) return retval; - LOCK_HEAP; - if(MSVCRT_new_handler) - (*MSVCRT_new_handler)(size); - UNLOCK_HEAP; - return retval; + void *retval; + int freed; + + do + { + retval = HeapAlloc(GetProcessHeap(), 0, size); + if(retval) + { + TRACE("(%ld) returning %p\n", size, retval); + return retval; + } + + LOCK_HEAP; + if(MSVCRT_new_handler) + freed = (*MSVCRT_new_handler)(size); + else + freed = 0; + UNLOCK_HEAP; + } while(freed); + + TRACE("(%ld) out of memory\n", size); + return NULL; } @@ -148,7 +163,7 @@ */ void* CDECL _expand(void* mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, mem, (DWORD)size); + return HeapReAlloc(GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, mem, size); } /********************************************************************* @@ -194,7 +209,7 @@ !HeapValidate( GetProcessHeap(), 0, phe.lpData )) { UNLOCK_HEAP; - __set_errno(GetLastError()); + __set_errno(GetLastError()); return _HEAPBADNODE; } @@ -273,7 +288,7 @@ /********************************************************************* * calloc (MSVCRT.@) */ -void* CDECL calloc(size_t size,size_t count) +void* CDECL calloc(size_t size, size_t count) { return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size * count ); } @@ -303,7 +318,7 @@ void* CDECL realloc(void* ptr, size_t size) { if (!ptr) return malloc(size); - if (size) return HeapReAlloc(GetProcessHeap(), 0, ptr, (DWORD)size); + if (size) return HeapReAlloc(GetProcessHeap(), 0, ptr, size); free(ptr); return NULL; } Modified: trunk/reactos/lib/sdk/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/undname.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] Sat Nov 5 10:08:06 2011 @@ -103,6 +103,8 @@ const char* right; }; +static BOOL symbol_demangle(struct parsed_symbol* sym); + /****************************************************************** * und_alloc * @@ -208,7 +210,7 @@ a->elts[a->num][len] = '\0'; if (++a->num >= a->max) a->max = a->num; { - unsigned int i; + int i; char c; for (i = a->max - 1; i >= 0; i--) @@ -414,11 +416,17 @@ /****************************************************************** * get_modifier - * Parses the type modifier. Always returns a static string - */ -static BOOL get_modifier(char ch, const char** ret) -{ - switch (ch) + * Parses the type modifier. Always returns static strings. + */ +static BOOL get_modifier(struct parsed_symbol *sym, const char **ret, const char **ptr_modif) +{ + *ptr_modif = NULL; + if (*sym->current == 'E') + { + *ptr_modif = "__ptr64"; + sym->current++; + } + switch (*sym->current++) { case 'A': *ret = NULL; break; case 'B': *ret = "const"; break; @@ -434,20 +442,27 @@ { const char* modifier; const char* str_modif; + const char *ptr_modif = ""; + + if (*sym->current == 'E') + { + ptr_modif = " __ptr64"; + sym->current++; + } switch (modif) { - case 'A': str_modif = " &"; break; - case 'B': str_modif = " & volatile"; break; - case 'P': str_modif = " *"; break; - case 'Q': str_modif = " * const"; break; - case 'R': str_modif = " * volatile"; break; - case 'S': str_modif = " * const volatile"; break; + case 'A': str_modif = str_printf(sym, " &%s", ptr_modif); break; + case 'B': str_modif = str_printf(sym, " &%s volatile", ptr_modif); break; + case 'P': str_modif = str_printf(sym, " *%s", ptr_modif); break; + case 'Q': str_modif = str_printf(sym, " *%s const", ptr_modif); break; + case 'R': str_modif = str_printf(sym, " *%s volatile", ptr_modif); break; + case 'S': str_modif = str_printf(sym, " *%s const volatile", ptr_modif); break; case '?': str_modif = ""; break; default: return FALSE; } - if (get_modifier(*sym->current++, &modifier)) + if (get_modifier(sym, &modifier, &ptr_modif)) { unsigned mark = sym->stack.num; struct datatype_t sub_ct; @@ -582,12 +597,31 @@ name = str_array_get_ref(&sym->names, *sym->current++ - '0'); break; case '?': - if (*++sym->current == '$') + switch (*++sym->current) { + case '$': sym->current++; if ((name = get_template_name(sym)) && !str_array_push(sym, name, -1, &sym->names)) return FALSE; + break; + case '?': + { + struct array stack = sym->stack; + unsigned int start = sym->names.start; + unsigned int num = sym->names.num; + + str_array_init( &sym->stack ); + if (symbol_demangle( sym )) name = str_printf( sym, "`%s'", sym->result ); + sym->names.start = start; + sym->names.num = num; + sym->stack = stack; + } + break; + default: + if (!(name = get_number( sym ))) return FALSE; + name = str_printf( sym, "`%s'", name ); + break; } break; default: @@ -922,10 +956,10 @@ case '$': if (*sym->current == 'C') { - const char* ptr; + const char *ptr, *ptr_modif; sym->current++; - if (!get_modifier(*sym->current++, &ptr)) goto done; + if (!get_modifier(sym, &ptr, &ptr_modif)) goto done; if (!demangle_datatype(sym, ct, pmt_ref, in_args)) goto done; ct->left = str_printf(sym, "%s %s", ct->left, ptr); } @@ -958,6 +992,7 @@ const char* access = NULL; const char* member_type = NULL; const char* modifier = NULL; + const char* ptr_modif; struct datatype_t ct; char* name = NULL; BOOL ret = FALSE; @@ -1002,14 +1037,16 @@ str_array_init(&pmt); if (!demangle_datatype(sym, &ct, &pmt, FALSE)) goto done; - if (!get_modifier(*sym->current++, &modifier)) goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; + if (modifier && ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); + else if (!modifier) modifier = ptr_modif; sym->stack.num = mark; } break; case '6' : /* compiler generated static */ case '7' : /* compiler generated static */ ct.left = ct.right = NULL; - if (!get_modifier(*sym->current++, &modifier)) goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; if (*sym->current != '@') { char* cls = NULL; @@ -1121,10 +1158,11 @@ { if (((accmem - 'A') % 8) != 2 && ((accmem - 'A') % 8) != 3) { + const char *ptr_modif; /* Implicit 'this' pointer */ /* If there is an implicit this pointer, const modifier follows */ - if (!get_modifier(*sym->current, &modifier)) goto done; - sym->current++; + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; + if (modifier || ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); } } @@ -1162,12 +1200,11 @@ /* Note: '()' after 'Z' means 'throws', but we don't care here * Yet!!! FIXME */ - sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s%s%s%s%s", + sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s%s%s%s", access, member_type, ct_ret.left, (ct_ret.left && !ct_ret.right) ? " " : NULL, call_conv, call_conv ? " " : NULL, exported, - name, args_str, modifier, - modifier ? " " : NULL, ct_ret.right); + name, args_str, modifier, ct_ret.right); ret = TRUE; done: return ret; @@ -1182,7 +1219,8 @@ const char* name; const char* args; - assert(*sym->current++ == '$'); + assert(*sym->current == '$'); + sym->current++; if (!(name = get_literal_string(sym))) return FALSE; if (!(args = get_args(sym, NULL, FALSE, '<', '>'))) return FALSE; sym->result = str_printf(sym, "%s%s", name, args); @@ -1214,14 +1252,18 @@ /* MS mangled names always begin with '?' */ if (*sym->current != '?') return FALSE; - str_array_init(&sym->names); - str_array_init(&sym->stack); sym->current++; /* Then function name or operator code */ - if (*sym->current == '?' && sym->current[1] != '$') + if (*sym->current == '?' && (sym->current[1] != '$' || sym->current[2] == '?')) { const char* function_name = NULL; + + if (sym->current[1] == '$') + { + do_after = 6; + sym->current += 2; + } /* C++ operator code (one character, or two if the first is '_') */ switch (*++sym->current) @@ -1355,6 +1397,17 @@ sym->result = (char*)function_name; ret = TRUE; goto done; + case 6: + { + char *args; + struct array array_pmt; + + str_array_init(&array_pmt); + args = get_args(sym, &array_pmt, FALSE, '<', '>'); + if (args != NULL) function_name = str_printf(sym, "%s%s", function_name, args); + sym->names.num = 0; + } + /* fall through */ default: if (!str_array_push(sym, function_name, -1, &sym->stack)) return FALSE; @@ -1400,7 +1453,7 @@ sym->flags &= ~UNDNAME_NO_FUNCTION_RETURNS; break; case 5: - sym->names.start = 1; + sym->names.start++; break; } @@ -1461,6 +1514,8 @@ sym.mem_alloc_ptr = memget; sym.mem_free_ptr = memfree; sym.current = mangled; + str_array_init( &sym.names ); + str_array_init( &sym.stack ); result = symbol_demangle(&sym) ? sym.result : mangled; if (buffer && buflen)

1 0

[tfaber] 54296: [MSVCRT_WINETEST] - Sync to Wine 1.3.32
by tfaber＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: tfaber Date: Sat Nov 5 09:54:41 2011 New Revision: 54296 URL: http://svn.reactos.org/svn/reactos?rev=54296&view=rev Log: [MSVCRT_WINETEST] - Sync to Wine 1.3.32 Added: trunk/rostests/winetests/msvcrt/msvcrt.h (with props) Modified: trunk/rostests/winetests/msvcrt/cpp.c trunk/rostests/winetests/msvcrt/data.c trunk/rostests/winetests/msvcrt/environ.c trunk/rostests/winetests/msvcrt/file.c trunk/rostests/winetests/msvcrt/headers.c trunk/rostests/winetests/msvcrt/locale.c trunk/rostests/winetests/msvcrt/misc.c trunk/rostests/winetests/msvcrt/printf.c trunk/rostests/winetests/msvcrt/scanf.c trunk/rostests/winetests/msvcrt/string.c trunk/rostests/winetests/msvcrt/time.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/msvcrt/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/cpp.c?re… Modified: trunk/rostests/winetests/msvcrt/data.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/data.c?r… Modified: trunk/rostests/winetests/msvcrt/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/environ.… Modified: trunk/rostests/winetests/msvcrt/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/file.c?r… Modified: trunk/rostests/winetests/msvcrt/headers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/headers.… Modified: trunk/rostests/winetests/msvcrt/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/locale.c… Modified: trunk/rostests/winetests/msvcrt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/misc.c?r… Added: trunk/rostests/winetests/msvcrt/msvcrt.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/msvcrt.h… Modified: trunk/rostests/winetests/msvcrt/printf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/printf.c… Modified: trunk/rostests/winetests/msvcrt/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/scanf.c?… Modified: trunk/rostests/winetests/msvcrt/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/string.c… Modified: trunk/rostests/winetests/msvcrt/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/time.c?r…

1 0

[tfaber] 54295: [PSDK][KERNEL32] - Fix some DWORD vs SIZE_T confusion for memory functions
by tfaber＠svn.reactos.org 05 Nov '11

05 Nov '11

Author: tfaber Date: Sat Nov 5 09:07:39 2011 New Revision: 54295 URL: http://svn.reactos.org/svn/reactos?rev=54295&view=rev Log: [PSDK][KERNEL32] - Fix some DWORD vs SIZE_T confusion for memory functions Modified: trunk/reactos/dll/win32/kernel32/client/heapmem.c trunk/reactos/dll/win32/kernel32/client/virtmem.c trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/dll/win32/kernel32/client/heapmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/heapmem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/heapmem.c [iso-8859-1] Sat Nov 5 09:07:39 2011 @@ -43,8 +43,8 @@ HANDLE WINAPI HeapCreate(DWORD flOptions, - DWORD dwInitialSize, - DWORD dwMaximumSize) + SIZE_T dwInitialSize, + SIZE_T dwMaximumSize) { HANDLE hRet; ULONG Flags; @@ -366,7 +366,7 @@ HGLOBAL NTAPI GlobalAlloc(UINT uFlags, - DWORD dwBytes) + SIZE_T dwBytes) { ULONG Flags = 0; PVOID Ptr = NULL; @@ -823,7 +823,7 @@ HGLOBAL NTAPI GlobalReAlloc(HGLOBAL hMem, - DWORD dwBytes, + SIZE_T dwBytes, UINT uFlags) { PBASE_HEAP_HANDLE_ENTRY HandleEntry; @@ -1085,7 +1085,7 @@ /* * @implemented */ -DWORD +SIZE_T NTAPI GlobalSize(HGLOBAL hMem) { Modified: trunk/reactos/dll/win32/kernel32/client/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/virtmem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/virtmem.c [iso-8859-1] Sat Nov 5 09:07:39 2011 @@ -27,7 +27,7 @@ IN DWORD flProtect) { NTSTATUS Status; - + /* Make sure the address is within the granularity of the system (64K) */ if ((lpAddress) && (lpAddress < (PVOID)BaseStaticServerData->SysInfo.AllocationGranularity)) @@ -36,7 +36,7 @@ SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - + /* Handle any possible exceptions */ _SEH2_TRY { @@ -53,7 +53,7 @@ Status = _SEH2_GetExceptionCode(); } _SEH2_END; - + /* Check for status */ if (!NT_SUCCESS(Status)) { @@ -193,7 +193,7 @@ IN SIZE_T dwSize) { NTSTATUS Status; - ULONG RegionSize = dwSize; + SIZE_T RegionSize = dwSize; PVOID BaseAddress = lpAddress; /* Lock the memory */ @@ -215,7 +215,7 @@ /* * @implemented */ -DWORD +SIZE_T NTAPI VirtualQuery(IN LPCVOID lpAddress, OUT PMEMORY_BASIC_INFORMATION lpBuffer, @@ -231,7 +231,7 @@ /* * @implemented */ -DWORD +SIZE_T NTAPI VirtualQueryEx(IN HANDLE hProcess, IN LPCVOID lpAddress, @@ -239,7 +239,7 @@ IN SIZE_T dwLength) { NTSTATUS Status; - ULONG ResultLength; + SIZE_T ResultLength; /* Query basic information */ Status = NtQueryVirtualMemory(hProcess, @@ -268,9 +268,9 @@ IN SIZE_T dwSize) { NTSTATUS Status; - ULONG RegionSize = dwSize; + SIZE_T RegionSize = dwSize; PVOID BaseAddress = lpAddress; - + /* Lock the memory */ Status = NtUnlockVirtualMemory(NtCurrentProcess(), &BaseAddress, Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sat Nov 5 09:07:39 2011 @@ -998,12 +998,12 @@ typedef struct _MEMORYSTATUS { DWORD dwLength; DWORD dwMemoryLoad; - DWORD dwTotalPhys; - DWORD dwAvailPhys; - DWORD dwTotalPageFile; - DWORD dwAvailPageFile; - DWORD dwTotalVirtual; - DWORD dwAvailVirtual; + SIZE_T dwTotalPhys; + SIZE_T dwAvailPhys; + SIZE_T dwTotalPageFile; + SIZE_T dwAvailPageFile; + SIZE_T dwTotalVirtual; + SIZE_T dwAvailVirtual; } MEMORYSTATUS,*LPMEMORYSTATUS; #if (_WIN32_WINNT >= 0x0500) @@ -1755,7 +1755,7 @@ UINT WINAPI GetWriteWatch(DWORD,PVOID,SIZE_T,PVOID*,PULONG_PTR,PULONG); ATOM WINAPI GlobalAddAtomA(LPCSTR); ATOM WINAPI GlobalAddAtomW( LPCWSTR); -HGLOBAL WINAPI GlobalAlloc(UINT,DWORD); +HGLOBAL WINAPI GlobalAlloc(UINT,SIZE_T); SIZE_T WINAPI GlobalCompact(DWORD); /* Obsolete: Has no effect. */ ATOM WINAPI GlobalDeleteAtom(ATOM); #define GlobalDiscard(m) GlobalReAlloc((m),0,GMEM_MOVEABLE) @@ -1772,8 +1772,8 @@ #if (_WIN32_WINNT >= 0x0500) BOOL WINAPI GlobalMemoryStatusEx(LPMEMORYSTATUSEX); #endif -HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,DWORD,UINT); -DWORD WINAPI GlobalSize(HGLOBAL); +HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,SIZE_T,UINT); +SIZE_T WINAPI GlobalSize(HGLOBAL); VOID WINAPI GlobalUnfix(HGLOBAL); /* Obsolete: Has no effect. */ BOOL WINAPI GlobalUnlock(HGLOBAL); BOOL WINAPI GlobalUnWire(HGLOBAL); /* Obsolete: Has no effect. */ @@ -1781,14 +1781,14 @@ #define HasOverlappedIoCompleted(lpOverlapped) ((lpOverlapped)->Internal != STATUS_PENDING) PVOID WINAPI HeapAlloc(HANDLE,DWORD,SIZE_T); SIZE_T WINAPI HeapCompact(HANDLE,DWORD); -HANDLE WINAPI HeapCreate(DWORD,DWORD,DWORD); +HANDLE WINAPI HeapCreate(DWORD,SIZE_T,SIZE_T); BOOL WINAPI HeapDestroy(HANDLE); BOOL WINAPI HeapFree(HANDLE,DWORD,PVOID); BOOL WINAPI HeapLock(HANDLE); #if (_WIN32_WINNT >= 0x0501) BOOL WINAPI HeapQueryInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T); #endif -PVOID WINAPI HeapReAlloc(HANDLE,DWORD,PVOID,DWORD); +PVOID WINAPI HeapReAlloc(HANDLE,DWORD,PVOID,SIZE_T); #if (_WIN32_WINNT >= 0x0501) BOOL WINAPI HeapSetInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T); #endif @@ -2288,8 +2288,8 @@ BOOL WINAPI VirtualLock(PVOID,SIZE_T); BOOL WINAPI VirtualProtect(PVOID,SIZE_T,DWORD,PDWORD); BOOL WINAPI VirtualProtectEx(HANDLE,PVOID,SIZE_T,DWORD,PDWORD); -DWORD WINAPI VirtualQuery(LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T); -DWORD WINAPI VirtualQueryEx(HANDLE,LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T); +SIZE_T WINAPI VirtualQuery(LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T); +SIZE_T WINAPI VirtualQueryEx(HANDLE,LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T); BOOL WINAPI VirtualUnlock(PVOID,SIZE_T); BOOL WINAPI WaitCommEvent(HANDLE,PDWORD,LPOVERLAPPED); BOOL WINAPI WaitForDebugEvent(LPDEBUG_EVENT,DWORD);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2011