Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 52769: [ROSTESTS] Add 3 missing tests to rbuild testcd. Thanks to Caemyr and Testman.
by spetreolle＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: spetreolle Date: Thu Jul 21 23:14:57 2011 New Revision: 52769 URL: http://svn.reactos.org/svn/reactos?rev=52769&view=rev Log: [ROSTESTS] Add 3 missing tests to rbuild testcd. Thanks to Caemyr and Testman. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Jul 21 23:14:57 2011 @@ -801,6 +801,7 @@ modules\rostests\winetests\gdiplus\gdiplus_winetest.exe 7 optional modules\rostests\winetests\hlink\hlink_winetest.exe 7 optional modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional +modules\rostests\winetests\imagehlp\imagehlp_winetest.exe 7 optional modules\rostests\winetests\imm32\imm32_winetest.exe 7 optional modules\rostests\winetests\inetcomm\inetcomm_winetest.exe 7 optional modules\rostests\winetests\inetmib1\inetmib1_winetest.exe 7 optional @@ -855,6 +856,7 @@ modules\rostests\winetests\twain_32\twain_32_winetest.exe 7 optional modules\rostests\winetests\urlmon\urlmon_winetest.exe 7 optional modules\rostests\winetests\user32\user32_winetest.exe 7 optional +modules\rostests\winetests\userenv\userenv_winetest.exe 7 optional modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional modules\rostests\winetests\uxtheme\uxtheme_winetest.exe 7 optional modules\rostests\winetests\version\version_winetest.exe 7 optional @@ -869,6 +871,7 @@ modules\rostests\apitests\dciman32\dciman32_apitest.exe 7 optional modules\rostests\apitests\gdi32\gdi32_apitest.exe 7 optional +modules\rostests\apitests\kernel32\kernel32_apitest.exe 7 optional modules\rostests\apitests\ntdll\ntdll_apitest.exe 7 optional modules\rostests\apitests\user32\user32_apitest.exe 7 optional modules\rostests\apitests\ws2_32\ws2_32_apitest.exe 7 optional

1 0

[jgardou] 52768: [SPEC2DEF] - fix forward name export for c++ mangled functions.
by jgardou＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: jgardou Date: Thu Jul 21 21:13:28 2011 New Revision: 52768 URL: http://svn.reactos.org/svn/reactos?rev=52768&view=rev Log: [SPEC2DEF] - fix forward name export for c++ mangled functions. 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] Thu Jul 21 21:13:28 2011 @@ -348,7 +348,7 @@ { /* C++ stubs are forwarded to C stubs */ fprintf(fileDest, "="); - fprintf(fileDest, "stub_function%d(", pexp->nNumber); + fprintf(fileDest, "stub_function%d", pexp->nNumber); } else if ((giArch == ARCH_X86) && gbKillAt && !gbMSComp && (pexp->nCallingConvention == CC_STDCALL ||

1 0

[cmihail] 52767: [lwIP] - Modify the signatures of the lwIP wrapper interfaces. This is the first step toward fixing some nasty crashes related to race conditions. [TCPIP] - Call the new lwIP wrapp...
by cmihail＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: cmihail Date: Thu Jul 21 20:58:54 2011 New Revision: 52767 URL: http://svn.reactos.org/svn/reactos?rev=52767&view=rev Log: [lwIP] - Modify the signatures of the lwIP wrapper interfaces. This is the first step toward fixing some nasty crashes related to race conditions. [TCPIP] - Call the new lwIP wrapper interfaces appropriately. Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/CMakeLists.txt branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Thu Jul 21 20:58:54 2011 @@ -67,7 +67,7 @@ AddressToBind.addr = Connection->AddressFile->Address.Address.IPv4Address; - Status = TCPTranslateError(LibTCPBind(Connection->SocketContext, + Status = TCPTranslateError(LibTCPBind(Connection, &AddressToBind, Connection->AddressFile->Port)); @@ -91,7 +91,7 @@ if (NT_SUCCESS(Status)) { - Connection->SocketContext = LibTCPListen(Connection->SocketContext, Backlog); + Connection->SocketContext = LibTCPListen(Connection, Backlog); if (!Connection->SocketContext) Status = STATUS_UNSUCCESSFUL; } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Thu Jul 21 20:58:54 2011 @@ -143,30 +143,32 @@ VOID TCPFinEventHandler(void *arg, err_t err) { - PCONNECTION_ENDPOINT Connection = arg; + PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT)arg; + + DbgPrint("[IP, TCPFinEventHandler] Called for Connection( 0x%x )-> SocketContext = pcb (0x%x)\n", Connection, Connection->SocketContext); /* Only clear the pointer if the shutdown was caused by an error */ if (err != ERR_OK) { /* We're already closed by the error so we don't want to call lwip_close */ + DbgPrint("[IP, TCPFinEventHandler] MAKING Connection( 0x%x )-> SocketContext = pcb (0x%x) NULL\n", Connection, Connection->SocketContext); Connection->SocketContext = NULL; } - - DbgPrint("[IP, TCPFinEventHandler] Called for Connection( 0x%x )-> SocketContext = pcb (0x%x)\n", Connection, Connection->SocketContext); FlushAllQueues(Connection, TCPTranslateError(err)); + + DbgPrint("[IP, TCPFinEventHandler] Done\n"); } VOID TCPAcceptEventHandler(void *arg, struct tcp_pcb *newpcb) { - PCONNECTION_ENDPOINT Connection = arg; + PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT)arg; PTDI_BUCKET Bucket; PLIST_ENTRY Entry; PIRP Irp; NTSTATUS Status; KIRQL OldIrql; - struct tcp_pcb* OldSocketContext; DbgPrint("[IP, TCPAcceptEventHandler] Called\n"); @@ -202,22 +204,19 @@ LockObject(Bucket->AssociatedEndpoint, &OldIrql); + /* sanity assert...this should never be in anything else but a CLOSED state */ + ASSERT(((struct tcp_pcb*)Bucket->AssociatedEndpoint->SocketContext)->state == CLOSED); + + /* free socket context created in FileOpenConnection, as we're using a new one */ + LibTCPClose(Bucket->AssociatedEndpoint, TRUE); + /* free previously created socket context (we don't use it, we use newpcb) */ - OldSocketContext = Bucket->AssociatedEndpoint->SocketContext; Bucket->AssociatedEndpoint->SocketContext = newpcb; - LibTCPAccept(newpcb, - (struct tcp_pcb*)Connection->SocketContext, - Bucket->AssociatedEndpoint); + LibTCPAccept(newpcb, (PTCP_PCB)Connection->SocketContext, Bucket->AssociatedEndpoint); DbgPrint("[IP, TCPAcceptEventHandler] Trying to unlock Bucket->AssociatedEndpoint\n"); UnlockObject(Bucket->AssociatedEndpoint, OldIrql); - - /* sanity assert...this should never be in anything else but a CLOSED state */ - ASSERT(((struct tcp_pcb*)OldSocketContext)->state == CLOSED); - - /* free socket context created in FileOpenConnection, as we're using a new one */ - LibTCPClose(OldSocketContext, TRUE); } DereferenceObject(Bucket->AssociatedEndpoint); @@ -270,7 +269,7 @@ ("Connection->SocketContext: %x\n", Connection->SocketContext)); - Status = TCPTranslateError(LibTCPSend(Connection->SocketContext, + Status = TCPTranslateError(LibTCPSend(Connection, SendBuffer, SendLen, TRUE)); @@ -368,7 +367,7 @@ VOID TCPConnectEventHandler(void *arg, err_t err) { - PCONNECTION_ENDPOINT Connection = arg; + PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT)arg; PTDI_BUCKET Bucket; PLIST_ENTRY Entry; Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Thu Jul 21 20:58:54 2011 @@ -115,19 +115,19 @@ DbgPrint("[IP, TCPClose] Called for Connection( 0x%x )->SocketConext( 0x%x )\n", Connection, Connection->SocketContext); Socket = Connection->SocketContext; - Connection->SocketContext = NULL; + //Connection->SocketContext = NULL; /* We should not be associated to an address file at this point */ ASSERT(!Connection->AddressFile); /* Don't try to close again if the other side closed us already */ - if (Socket) + if (Connection->SocketContext) { FlushAllQueues(Connection, STATUS_CANCELLED); DbgPrint("[IP, TCPClose] Socket (pcb) = 0x%x\n", Socket); - LibTCPClose(Socket, FALSE); + LibTCPClose(Connection, FALSE); } DbgPrint("[IP, TCPClose] Leaving. Connection->RefCount = %d\n", Connection->RefCount); @@ -299,7 +299,7 @@ bindaddr.addr = Connection->AddressFile->Address.Address.IPv4Address; } - Status = TCPTranslateError(LibTCPBind(Connection->SocketContext, + Status = TCPTranslateError(LibTCPBind(Connection, &bindaddr, Connection->AddressFile->Port)); @@ -338,7 +338,7 @@ InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); - Status = TCPTranslateError(LibTCPConnect(Connection->SocketContext, + Status = TCPTranslateError(LibTCPConnect(Connection, &connaddr, RemotePort)); @@ -372,12 +372,12 @@ { if (Flags & TDI_DISCONNECT_RELEASE) { - Status = TCPTranslateError(LibTCPShutdown(Connection->SocketContext, 0, 1)); + Status = TCPTranslateError(LibTCPShutdown(Connection, 0, 1)); } if ((Flags & TDI_DISCONNECT_ABORT) || !Flags) { - Status = TCPTranslateError(LibTCPShutdown(Connection->SocketContext, 1, 1)); + Status = TCPTranslateError(LibTCPShutdown(Connection, 1, 1)); } } else @@ -464,7 +464,7 @@ Connection->SocketContext)); DbgPrint("[IP, TCPSendData] Called\n"); - Status = TCPTranslateError(LibTCPSend(Connection->SocketContext, + Status = TCPTranslateError(LibTCPSend(Connection, BufferData, SendLength, FALSE)); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/CMakeLists.txt [iso-8859-1] Thu Jul 21 20:58:54 2011 @@ -1,3 +1,8 @@ +include_directories( + BEFORE include + ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include + ${REACTOS_SOURCE_DIR}/lib/drivers/lwip/src/include + ${REACTOS_SOURCE_DIR}/lib/drivers/lwip/src/include/ipv4) include_directories( src/include Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] Thu Jul 21 20:58:54 2011 @@ -4,6 +4,9 @@ #include "lwip/tcp.h" #include "lwip/pbuf.h" #include "lwip/ip_addr.h" +#include "tcpip.h" + +typedef struct tcp_pcb* PTCP_PCB; /* External TCP event handlers */ extern void TCPConnectEventHandler(void *arg, const err_t err); @@ -13,16 +16,17 @@ extern u32_t TCPRecvEventHandler(void *arg, struct pbuf *p); /* TCP functions */ -struct tcp_pcb *LibTCPSocket(void *arg); -err_t LibTCPBind(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, const u16_t port); -struct tcp_pcb *LibTCPListen(struct tcp_pcb *pcb, const u8_t backlog); -err_t LibTCPSend(struct tcp_pcb *pcb, void *const dataptr, const u16_t len, const int safe); -err_t LibTCPConnect(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, const u16_t port); -err_t LibTCPShutdown(struct tcp_pcb *pcb, const int shut_rx, const int shut_tx); -err_t LibTCPClose(struct tcp_pcb *pcb, const int safe); -err_t LibTCPGetPeerName(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, u16_t *const port); -err_t LibTCPGetHostName(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, u16_t *const port); -void LibTCPAccept(struct tcp_pcb *pcb, struct tcp_pcb *listen_pcb, void *arg); +PTCP_PCB LibTCPSocket(void *arg); +err_t LibTCPBind(PCONNECTION_ENDPOINT Connection, struct ip_addr *const ipaddr, const u16_t port); +PTCP_PCB LibTCPListen(PCONNECTION_ENDPOINT Connection, const u8_t backlog); +err_t LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, const int safe); +err_t LibTCPConnect(PCONNECTION_ENDPOINT Connection, struct ip_addr *const ipaddr, const u16_t port); +err_t LibTCPShutdown(PCONNECTION_ENDPOINT Connection, const int shut_rx, const int shut_tx); +err_t LibTCPClose(PCONNECTION_ENDPOINT Connection, const int safe); + +err_t LibTCPGetPeerName(PTCP_PCB pcb, struct ip_addr *const ipaddr, u16_t *const port); +err_t LibTCPGetHostName(PTCP_PCB pcb, struct ip_addr *const ipaddr, u16_t *const port); +void LibTCPAccept(PTCP_PCB pcb, struct tcp_pcb *listen_pcb, void *arg); /* IP functions */ void LibIPInsertPacket(void *ifarg, const void *const data, const u32_t size); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Thu Jul 21 20:58:54 2011 @@ -272,7 +272,7 @@ KEVENT Event; /* Input */ - struct tcp_pcb *Pcb; + PCONNECTION_ENDPOINT Connection; struct ip_addr *IpAddress; u16_t Port; @@ -288,18 +288,20 @@ ASSERT(msg); - msg->Error = tcp_bind(msg->Pcb, msg->IpAddress, ntohs(msg->Port)); + msg->Error = tcp_bind((PTCP_PCB)msg->Connection->SocketContext, + msg->IpAddress, + ntohs(msg->Port)); KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); } err_t -LibTCPBind(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, const u16_t port) +LibTCPBind(PCONNECTION_ENDPOINT Connection, struct ip_addr *const ipaddr, const u16_t port) { struct bind_callback_msg *msg; err_t ret; - if (!pcb) + if (!Connection->SocketContext) return ERR_CLSD; DbgPrint("[lwIP, LibTCPBind] Called\n"); @@ -308,7 +310,7 @@ if (msg) { KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); - msg->Pcb = pcb; + msg->Connection = Connection; msg->IpAddress = ipaddr; msg->Port = port; @@ -319,7 +321,7 @@ else ret = ERR_CLSD; - DbgPrint("[lwIP, LibTCPBind] pcb = 0x%x\n", pcb); + DbgPrint("[lwIP, LibTCPBind] pcb = 0x%x\n", Connection->SocketContext); DbgPrint("[lwIP, LibTCPBind] Done\n"); @@ -337,11 +339,11 @@ KEVENT Event; /* Input */ - struct tcp_pcb *Pcb; + PCONNECTION_ENDPOINT Connection; u8_t Backlog; /* Output */ - struct tcp_pcb *NewPcb; + PTCP_PCB NewPcb; }; static @@ -354,7 +356,7 @@ DbgPrint("[lwIP, LibTCPListenCallback] Called\n"); - msg->NewPcb = tcp_listen_with_backlog(msg->Pcb, msg->Backlog); + msg->NewPcb = tcp_listen_with_backlog((PTCP_PCB)msg->Connection->SocketContext, msg->Backlog); if (msg->NewPcb) { @@ -366,22 +368,22 @@ KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); } -struct tcp_pcb * -LibTCPListen(struct tcp_pcb *pcb, const u8_t backlog) +PTCP_PCB +LibTCPListen(PCONNECTION_ENDPOINT Connection, const u8_t backlog) { struct listen_callback_msg *msg; - void *ret; - - DbgPrint("[lwIP, LibTCPListen] Called on pcb = 0x%x\n", pcb); - - if (!pcb) + PTCP_PCB ret; + + DbgPrint("[lwIP, LibTCPListen] Called on pcb = 0x%x\n", Connection->SocketContext); + + if (!Connection->SocketContext) return NULL; msg = ExAllocatePool(NonPagedPool, sizeof(struct listen_callback_msg)); if (msg) { KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); - msg->Pcb = pcb; + msg->Connection = Connection; msg->Backlog = backlog; tcpip_callback_with_block(LibTCPListenCallback, msg, 1); @@ -392,7 +394,7 @@ ret = NULL; DbgPrint("[lwIP, LibTCPListen] pcb = 0x%x, newpcb = 0x%x, sizeof(pcb) = %d \n", - pcb, ret, sizeof(struct tcp_pcb)); + Connection->SocketContext, ret, sizeof(struct tcp_pcb)); DbgPrint("[lwIP, LibTCPListen] Done\n"); @@ -410,7 +412,7 @@ KEVENT Event; /* Input */ - struct tcp_pcb *Pcb; + PCONNECTION_ENDPOINT Connection; void *Data; u16_t DataLength; @@ -426,26 +428,29 @@ ASSERT(msg); - if (tcp_sndbuf(msg->Pcb) < msg->DataLength) + if (tcp_sndbuf((PTCP_PCB)msg->Connection->SocketContext) < msg->DataLength) { msg->Error = ERR_INPROGRESS; } else { - msg->Error = tcp_write(msg->Pcb, msg->Data, msg->DataLength, TCP_WRITE_FLAG_COPY); - - tcp_output(msg->Pcb); + msg->Error = tcp_write((PTCP_PCB)msg->Connection->SocketContext, + msg->Data, + msg->DataLength, + TCP_WRITE_FLAG_COPY); + + tcp_output((PTCP_PCB)msg->Connection->SocketContext); } KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); } err_t -LibTCPSend(struct tcp_pcb *pcb, void *const dataptr, const u16_t len, const int safe) +LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, const int safe) { err_t ret; - if (!pcb) + if (!Connection->SocketContext) return ERR_CLSD; /* @@ -455,14 +460,14 @@ */ if (safe) { - if (tcp_sndbuf(pcb) < len) + if (tcp_sndbuf((PTCP_PCB)Connection->SocketContext) < len) { ret = ERR_INPROGRESS; } else { - ret = tcp_write(pcb, dataptr, len, TCP_WRITE_FLAG_COPY); - tcp_output(pcb); + ret = tcp_write((PTCP_PCB)Connection->SocketContext, dataptr, len, TCP_WRITE_FLAG_COPY); + tcp_output((PTCP_PCB)Connection->SocketContext); } return ret; @@ -475,7 +480,7 @@ if (msg) { KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); - msg->Pcb = pcb; + msg->Connection = Connection; msg->Data = dataptr; msg->DataLength = len; @@ -486,7 +491,7 @@ else ret = ERR_CLSD; - DbgPrint("[lwIP, LibTCPSend] pcb = 0x%x\n", pcb); + DbgPrint("[lwIP, LibTCPSend] pcb = 0x%x\n", Connection->SocketContext); ExFreePool(msg); @@ -503,7 +508,7 @@ KEVENT Event; /* Input */ - struct tcp_pcb *Pcb; + PCONNECTION_ENDPOINT Connection; struct ip_addr *IpAddress; u16_t Port; @@ -521,10 +526,13 @@ ASSERT(arg); - tcp_recv(msg->Pcb, InternalRecvEventHandler); - tcp_sent(msg->Pcb, InternalSendEventHandler); - - err_t Error = tcp_connect(msg->Pcb, msg->IpAddress, ntohs(msg->Port), InternalConnectEventHandler); + tcp_recv((PTCP_PCB)msg->Connection->SocketContext, InternalRecvEventHandler); + tcp_sent((PTCP_PCB)msg->Connection->SocketContext, InternalSendEventHandler); + + err_t Error = tcp_connect((PTCP_PCB)msg->Connection->SocketContext, + msg->IpAddress, ntohs(msg->Port), + InternalConnectEventHandler); + msg->Error = Error == ERR_OK ? ERR_INPROGRESS : Error; KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); @@ -533,21 +541,21 @@ } err_t -LibTCPConnect(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, const u16_t port) +LibTCPConnect(PCONNECTION_ENDPOINT Connection, struct ip_addr *const ipaddr, const u16_t port) { struct connect_callback_msg *msg; err_t ret; DbgPrint("[lwIP, LibTCPConnect] Called\n"); - if (!pcb) + if (!Connection->SocketContext) return ERR_CLSD; msg = ExAllocatePool(NonPagedPool, sizeof(struct connect_callback_msg)); if (msg) { KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); - msg->Pcb = pcb; + msg->Connection = Connection; msg->IpAddress = ipaddr; msg->Port = port; @@ -562,7 +570,7 @@ ExFreePool(msg); - DbgPrint("[lwIP, LibTCPConnect] pcb = 0x%x\n", pcb); + DbgPrint("[lwIP, LibTCPConnect] pcb = 0x%x\n", Connection->SocketContext); DbgPrint("[lwIP, LibTCPConnect] Done\n"); @@ -578,7 +586,7 @@ KEVENT Event; /* Input */ - struct tcp_pcb *Pcb; + PCONNECTION_ENDPOINT Connection; int shut_rx; int shut_tx; @@ -597,9 +605,12 @@ it means lwIP will take care of it anyway and if it does so before us it will cause memory corruption. */ - if ((msg->Pcb->state == ESTABLISHED) || (msg->Pcb->state == SYN_RCVD)) - { - msg->Error = tcp_shutdown(msg->Pcb, msg->shut_rx, msg->shut_tx); + if ((((PTCP_PCB)msg->Connection->SocketContext)->state == ESTABLISHED) || + (((PTCP_PCB)msg->Connection->SocketContext)->state == SYN_RCVD)) + { + msg->Error = + tcp_shutdown((PTCP_PCB)msg->Connection->SocketContext, + msg->shut_rx, msg->shut_tx); } else msg->Error = ERR_OK; @@ -608,27 +619,29 @@ } err_t -LibTCPShutdown(struct tcp_pcb *pcb, const int shut_rx, const int shut_tx) +LibTCPShutdown(PCONNECTION_ENDPOINT Connection, const int shut_rx, const int shut_tx) { struct shutdown_callback_msg *msg; err_t ret; - DbgPrint("[lwIP, LibTCPShutdown] Called on pcb = 0x%x, rx = %d, tx = %d\n", pcb, shut_rx, shut_tx); - - if (!pcb) + DbgPrint("[lwIP, LibTCPShutdown] Called on pcb = 0x%x, rx = %d, tx = %d\n", + Connection->SocketContext, shut_rx, shut_tx); + + if (!Connection->SocketContext) { DbgPrint("[lwIP, LibTCPShutdown] Done... NO pcb\n"); return ERR_CLSD; } - DbgPrint("[lwIP, LibTCPShutdown] pcb->state = %s\n", tcp_state_str[pcb->state]); + DbgPrint("[lwIP, LibTCPShutdown] pcb->state = %s\n", + tcp_state_str[((PTCP_PCB)Connection->SocketContext)->state]); msg = ExAllocatePool(NonPagedPool, sizeof(struct shutdown_callback_msg)); if (msg) { KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); - msg->Pcb = pcb; + msg->Connection = Connection; msg->shut_rx = shut_rx; msg->shut_tx = shut_tx; @@ -655,7 +668,7 @@ KEVENT Event; /* Input */ - struct tcp_pcb *Pcb; + PCONNECTION_ENDPOINT Connection; /* Output */ err_t Error; @@ -663,49 +676,9 @@ static void -LibTCPCloseCallback(void *arg) -{ - struct close_callback_msg *msg = arg; - - if (msg->Pcb->state == CLOSED) - { - DbgPrint("[lwIP, LibTCPCloseCallback] Connection was closed on us\n"); - msg->Error = ERR_OK; - } - - if (msg->Pcb->state == LISTEN) - { - DbgPrint("[lwIP, LibTCPCloseCallback] Closing a listener\n"); - msg->Error = tcp_close(msg->Pcb); - } - else - { - DbgPrint("[lwIP, LibTCPCloseCallback] Aborting a connection\n"); - tcp_abort(msg->Pcb); - msg->Error = ERR_OK; - } - - KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); -} - -err_t -//LibTCPClose(struct tcp_pcb *pcb, const int safe) -LibTCPClose(struct tcp_pcb *pcb, const int safe) -{ - err_t ret; - - DbgPrint("[lwIP, LibTCPClose] Called on pcb = 0x%x\n", pcb); - - if (!pcb) - { - DbgPrint("[lwIP, LibTCPClose] Done... NO pcb\n"); - return ERR_CLSD; - } - - DbgPrint("[lwIP, LibTCPClose] pcb->state = %s\n", tcp_state_str[pcb->state]); - +CloseCallbacks(struct tcp_pcb *pcb) +{ tcp_arg(pcb, NULL); - /* if this pcb is not in LISTEN state than it has valid recv, send and err callbacks to cancel @@ -718,6 +691,58 @@ } tcp_accept(pcb, NULL); +} + +static +void +LibTCPCloseCallback(void *arg) +{ + struct close_callback_msg *msg = arg; + + DbgPrint("[lwIP, LibTCPCloseCallback] pcb = 0x%x\n", (PTCP_PCB)msg->Connection->SocketContext); + + if (!msg->Connection->SocketContext) + { + DbgPrint("[lwIP, LibTCPCloseCallback] NULL pcb...bail, bail!!!\n"); + + ASSERT(FALSE); + + msg->Error = ERR_OK; + return; + } + + CloseCallbacks((PTCP_PCB)msg->Connection->SocketContext); + + if (((PTCP_PCB)msg->Connection->SocketContext)->state == LISTEN) + { + DbgPrint("[lwIP, LibTCPCloseCallback] Closing a listener\n"); + msg->Error = tcp_close((PTCP_PCB)msg->Connection->SocketContext); + } + else + { + DbgPrint("[lwIP, LibTCPCloseCallback] Aborting a connection\n"); + tcp_abort((PTCP_PCB)msg->Connection->SocketContext); + msg->Error = ERR_OK; + } + + KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); +} + +err_t +LibTCPClose(PCONNECTION_ENDPOINT Connection, const int safe) +{ + err_t ret; + + DbgPrint("[lwIP, LibTCPClose] Called on pcb = 0x%x\n", Connection->SocketContext); + + if (!Connection->SocketContext) + { + DbgPrint("[lwIP, LibTCPClose] Done... NO pcb\n"); + return ERR_CLSD; + } + + DbgPrint("[lwIP, LibTCPClose] pcb->state = %s\n", + tcp_state_str[((PTCP_PCB)Connection->SocketContext)->state]); /* If we're being called from a handler it means we're in the conetxt of teh tcpip @@ -726,15 +751,16 @@ */ if (safe) { - if (pcb->state == LISTEN) + CloseCallbacks((PTCP_PCB)Connection->SocketContext); + if ( ((PTCP_PCB)Connection->SocketContext)->state == LISTEN ) { DbgPrint("[lwIP, LibTCPClose] Closing a listener\n"); - ret = tcp_close(pcb); + ret = tcp_close((PTCP_PCB)Connection->SocketContext); } else { DbgPrint("[lwIP, LibTCPClose] Aborting a connection\n"); - tcp_abort(pcb); + tcp_abort((PTCP_PCB)Connection->SocketContext); ret = ERR_OK; } @@ -749,7 +775,7 @@ { KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); - msg->Pcb = pcb; + msg->Connection = Connection; tcpip_callback_with_block(LibTCPCloseCallback, msg, 1); @@ -772,7 +798,7 @@ } void -LibTCPAccept(struct tcp_pcb *pcb, struct tcp_pcb *listen_pcb, void *arg) +LibTCPAccept(PTCP_PCB pcb, struct tcp_pcb *listen_pcb, void *arg) { DbgPrint("[lwIP, LibTCPAccept] Called. (pcb, arg) = (0x%x, 0x%x)\n", pcb, arg); @@ -790,7 +816,7 @@ } err_t -LibTCPGetHostName(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, u16_t *const port) +LibTCPGetHostName(PTCP_PCB pcb, struct ip_addr *const ipaddr, u16_t *const port) { DbgPrint("[lwIP, LibTCPGetHostName] Called. pcb = (0x%x)\n", pcb); @@ -808,7 +834,7 @@ } err_t -LibTCPGetPeerName(struct tcp_pcb *pcb, struct ip_addr * const ipaddr, u16_t * const port) +LibTCPGetPeerName(PTCP_PCB pcb, struct ip_addr * const ipaddr, u16_t * const port) { DbgPrint("[lwIP, LibTCPGetPeerName] pcb = (0x%x)\n", pcb);

1 0

[tkreuzer] 52766: [CMAKE] Add msvcrt20 and msvcrt40 to build
by tkreuzer＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: tkreuzer Date: Thu Jul 21 18:40:41 2011 New Revision: 52766 URL: http://svn.reactos.org/svn/reactos?rev=52766&view=rev Log: [CMAKE] Add msvcrt20 and msvcrt40 to build Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Thu Jul 21 18:40:41 2011 @@ -108,8 +108,8 @@ add_subdirectory(mssip32) add_subdirectory(mstask) add_subdirectory(msvcrt) -#add_subdirectory(msvcrt20) FIX spec2def -#add_subdirectory(msvcrt40) FIX spec2def +add_subdirectory(msvcrt20) +add_subdirectory(msvcrt40) add_subdirectory(msvfw32) add_subdirectory(msvidc32) add_subdirectory(mswsock) Modified: trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] Thu Jul 21 18:40:41 2011 @@ -8,6 +8,7 @@ list(APPEND SOURCE msvcrt20.c + ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def) add_library(msvcrt20 SHARED ${SOURCE}) Modified: trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] Thu Jul 21 18:40:41 2011 @@ -8,6 +8,7 @@ list(APPEND SOURCE msvcrt40.c + ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def) add_library(msvcrt40 SHARED ${SOURCE})

1 0

[tkreuzer] 52765: [SPEC2DEF] Fix creation of stubs for c++ mangled names
by tkreuzer＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: tkreuzer Date: Thu Jul 21 18:39:24 2011 New Revision: 52765 URL: http://svn.reactos.org/svn/reactos?rev=52765&view=rev Log: [SPEC2DEF] Fix creation of stubs for c++ mangled names 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] Thu Jul 21 18:39:24 2011 @@ -19,6 +19,7 @@ int nArgCount; int anArgs[30]; unsigned int uFlags; + int nNumber; } EXPORT; enum _ARCH @@ -168,7 +169,15 @@ fprintf(file, "__stdcall "); } - fprintf(file, "%.*s(", pexp->nNameLength, pexp->pcName); + /* Check for C++ */ + if (pexp->pcName[0] == '?') + { + fprintf(file, "stub_function%d(", pexp->nNumber); + } + else + { + fprintf(file, "%.*s(", pexp->nNameLength, pexp->pcName); + } for (i = 0; i < pexp->nArgCount; i++) { @@ -334,6 +343,13 @@ fprintf(fileDest, "="); PrintName(fileDest, pexp, "", 1, fDeco && !gbMSComp); } + else if (((pexp->uFlags & FL_STUB) || (pexp->nCallingConvention == CC_STUB)) && + (pexp->pcName[0] == '?')) + { + /* C++ stubs are forwarded to C stubs */ + fprintf(fileDest, "="); + fprintf(fileDest, "stub_function%d(", pexp->nNumber); + } else if ((giArch == ARCH_X86) && gbKillAt && !gbMSComp && (pexp->nCallingConvention == CC_STDCALL || pexp->nCallingConvention == CC_FASTCALL)) @@ -379,12 +395,14 @@ /* Loop all lines */ nLine = 1; + exp.nNumber = 0; for (pcLine = pcStart; *pcLine; pcLine = NextLine(pcLine), nLine++) { pc = pcLine; exp.nArgCount = 0; exp.uFlags = 0; + exp.nNumber++; //fprintf(stderr, "info: line %d, token:'%d, %.20s'\n", // nLine, TokenLength(pcLine), pcLine); @@ -591,7 +609,7 @@ /* Check for c++ mangled name */ if (pc[0] == '?') { - printf("Found c++ mangled name...\n"); + //printf("Found c++ mangled name...\n"); // } else

1 0

[spetreolle] 52764: [HIVES] Fix Nls registry keys casing. Tested by Alex.
by spetreolle＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: spetreolle Date: Thu Jul 21 17:33:38 2011 New Revision: 52764 URL: http://svn.reactos.org/svn/reactos?rev=52764&view=rev Log: [HIVES] Fix Nls registry keys casing. Tested by Alex. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386…

1 0

[ion] 52763: [KERNEL32]: Don't know how to fix this without breaking the synch... but this should fix CMAKE.
by ion＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: ion Date: Thu Jul 21 17:28:21 2011 New Revision: 52763 URL: http://svn.reactos.org/svn/reactos?rev=52763&view=rev Log: [KERNEL32]: Don't know how to fix this without breaking the synch... but this should fix CMAKE. Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] Thu Jul 21 17:28:21 2011 @@ -483,7 +483,7 @@ /* not compressed? just copy */ if (!IS_LZ_HANDLE(src)) - xread=_lread; + xread=(_readfun)_hread; // ROSHACK else xread=(_readfun)LZRead; len=0;

1 0

[ion] 52762: [KERNEL32]: C'mon cmake..you can do it!
by ion＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: ion Date: Thu Jul 21 17:21:43 2011 New Revision: 52762 URL: http://svn.reactos.org/svn/reactos?rev=52762&view=rev Log: [KERNEL32]: C'mon cmake..you can do it! Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c trunk/reactos/dll/win32/kernel32/client/vista.c trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/kernel32/kernel32.spec Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] Thu Jul 21 17:21:43 2011 @@ -56,6 +56,8 @@ #define HeapAlloc RtlAllocateHeap #define HeapReAlloc RtlReAllocateHeap #define HeapFree RtlFreeHeap +#define _lread(a, b, c) (long)(_hread(a, b, (long)c)) +#define _lwrite(a, b, c) (long)(_hwrite(a, b, (long)c)) WINE_DEFAULT_DEBUG_CHANNEL(file); /* The readahead length of the decompressor. Reading single bytes Modified: trunk/reactos/dll/win32/kernel32/client/vista.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] Thu Jul 21 17:21:43 2011 @@ -307,29 +307,6 @@ { UNIMPLEMENTED; return E_FAIL; -} - -/* - * @implemented - */ -ULONGLONG -WINAPI -GetTickCount64(VOID) -{ - ULARGE_INTEGER TickCount; - - while (TRUE) - { - TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; - TickCount.LowPart = SharedUserData->TickCount.LowPart; - - if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) break; - - YieldProcessor(); - } - - return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + - (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8); } /*-------------------------------------------------------------- @@ -869,3 +846,25 @@ #endif +/* + * @implemented + */ +ULONGLONG +WINAPI +GetTickCount64(VOID) +{ + ULARGE_INTEGER TickCount; + + while (TRUE) + { + TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; + TickCount.LowPart = SharedUserData->TickCount.LowPart; + + if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) break; + + YieldProcessor(); + } + + return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + + (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8); +} Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Jul 21 17:21:43 2011 @@ -773,7 +773,6 @@ ;@ stdcall InitializeConditionVariable ntdll.RtlInitializeConditionVariable ; Win 7 @ stdcall InitializeCriticalSection(ptr) ; FIXME: ntdll.RtlInitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -@ stdcall InitializeCriticalSectionEx(ptr long long) ;@ stdcall InitializeExtendedContext ; Win 7 ;@ stdcall InitializeProcThreadAttributeList api-ms-win-core-processthreads-l1-1-0.InitializeProcThreadAttributeList ; Win 7 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @@ -971,8 +970,6 @@ @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) -@ stdcall QueryFullProcessImageNameA(ptr long str ptr) ; Vista and later -@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) ; Vista and later ;@ stdcall QueryIdleProcessorCycleTime ; Win 7 ;@ stdcall QueryIdleProcessorCycleTimeEx ; Win 7 @ stdcall QueryInformationJobObject(long long ptr long ptr) @@ -1053,7 +1050,6 @@ ;@ stdcall RegUnLoadKeyA ; Win 7 ;@ stdcall RegUnLoadKeyW ; Win 7 ;@ stdcall RegisterApplicationRecoveryCallback ; Win 7 -@ stdcall RegisterApplicationRestart(wstr long) @ stdcall RegisterConsoleIME(ptr ptr) @ stdcall RegisterConsoleOS2(long) @ stdcall RegisterConsoleVDM(long long long long long long long long long long long) Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Thu Jul 21 17:21:43 2011 @@ -771,7 +771,6 @@ ;@ stdcall InitializeConditionVariable ntdll.RtlInitializeConditionVariable ; Win 7 @ stdcall InitializeCriticalSection(ptr) ; FIXME: ntdll.RtlInitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -@ stdcall InitializeCriticalSectionEx(ptr long long) ;@ stdcall InitializeExtendedContext ; Win 7 ;@ stdcall InitializeProcThreadAttributeList api-ms-win-core-processthreads-l1-1-0.InitializeProcThreadAttributeList ; Win 7 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @@ -969,8 +968,6 @@ @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) -@ stdcall QueryFullProcessImageNameA(ptr long str ptr) ; Vista and later -@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) ; Vista and later ;@ stdcall QueryIdleProcessorCycleTime ; Win 7 ;@ stdcall QueryIdleProcessorCycleTimeEx ; Win 7 @ stdcall QueryInformationJobObject(long long ptr long ptr) @@ -1051,7 +1048,6 @@ ;@ stdcall RegUnLoadKeyA ; Win 7 ;@ stdcall RegUnLoadKeyW ; Win 7 ;@ stdcall RegisterApplicationRecoveryCallback ; Win 7 -@ stdcall RegisterApplicationRestart(wstr long) @ stdcall RegisterConsoleIME(ptr ptr) @ stdcall RegisterConsoleOS2(long) @ stdcall RegisterConsoleVDM(long long long long long long long long long long long)

1 0

[ion] 52761: [KERNEL32]: Add the #defines only to Winesynched code. Should fix CMAKE build... [KERNEL32]: Move more Vista APIs out of the way and un-export some functions. Reset the WINNT_VERSION t...
by ion＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: ion Date: Thu Jul 21 17:02:48 2011 New Revision: 52761 URL: http://svn.reactos.org/svn/reactos?rev=52761&view=rev Log: [KERNEL32]: Add the #defines only to Winesynched code. Should fix CMAKE build... [KERNEL32]: Move more Vista APIs out of the way and un-export some functions. Reset the WINNT_VERSION to 0x502 instead of 0x600, except for synch.c (TBD). [KERNEL32]: Fix casts and math in GetTickCount and GetTickCount64. GetTickCount64 is Vista, but Wine-synched DLLs need it, so leave it exported. Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/file/console.c trunk/reactos/dll/win32/kernel32/client/file/create.c trunk/reactos/dll/win32/kernel32/client/file/file.c trunk/reactos/dll/win32/kernel32/client/misc/comm.c trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c trunk/reactos/dll/win32/kernel32/client/misc/profile.c trunk/reactos/dll/win32/kernel32/client/misc/res.c trunk/reactos/dll/win32/kernel32/client/misc/time.c trunk/reactos/dll/win32/kernel32/client/synch.c trunk/reactos/dll/win32/kernel32/client/vista.c trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/kernel32/kernel32.spec trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c trunk/reactos/dll/win32/kernel32/winnls/string/lang.c trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -1,12 +1,5 @@ add_definitions(-D_KERNEL32_) - -add_definitions(-DHeapAlloc=RtlAllocateHeap) -add_definitions(-DHeapFree=RtlFreeHeap) -add_definitions(-DGetProcessHeap=RtlGetProcessHeap) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) Modified: trunk/reactos/dll/win32/kernel32/client/file/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -4195,145 +4195,4 @@ return Ret; } - -/*-------------------------------------------------------------- - * GetConsoleHistoryInfo - * - * @implemented - */ -BOOL -WINAPI -GetConsoleHistoryInfo(PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) -{ - CSR_API_MESSAGE Request; - ULONG CsrRequest = MAKE_CSR_API(GET_HISTORY_INFO, CSR_CONSOLE); - NTSTATUS Status; - if (lpConsoleHistoryInfo->cbSize != sizeof(CONSOLE_HISTORY_INFO)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - Status = CsrClientCallServer(&Request, NULL, CsrRequest, sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - lpConsoleHistoryInfo->HistoryBufferSize = Request.Data.GetHistoryInfo.HistoryBufferSize; - lpConsoleHistoryInfo->NumberOfHistoryBuffers = Request.Data.GetHistoryInfo.NumberOfHistoryBuffers; - lpConsoleHistoryInfo->dwFlags = Request.Data.GetHistoryInfo.dwFlags; - return TRUE; -} - - -/*-------------------------------------------------------------- - * SetConsoleHistoryInfo - * - * @implemented - */ -BOOL -WINAPI -SetConsoleHistoryInfo(IN PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) -{ - CSR_API_MESSAGE Request; - ULONG CsrRequest = MAKE_CSR_API(GET_HISTORY_INFO, CSR_CONSOLE); - NTSTATUS Status; - if (lpConsoleHistoryInfo->cbSize != sizeof(CONSOLE_HISTORY_INFO)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - Request.Data.SetHistoryInfo.HistoryBufferSize = lpConsoleHistoryInfo->HistoryBufferSize; - Request.Data.SetHistoryInfo.NumberOfHistoryBuffers = lpConsoleHistoryInfo->NumberOfHistoryBuffers; - Request.Data.SetHistoryInfo.dwFlags = lpConsoleHistoryInfo->dwFlags; - Status = CsrClientCallServer(&Request, NULL, CsrRequest, sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - return TRUE; -} - - -/*-------------------------------------------------------------- - * GetConsoleOriginalTitleW - * - * @unimplemented - */ -DWORD -WINAPI -GetConsoleOriginalTitleW(OUT LPWSTR lpConsoleTitle, - IN DWORD nSize) -{ - DPRINT1("GetConsoleOriginalTitleW(0x%p, 0x%x) UNIMPLEMENTED!\n", lpConsoleTitle, nSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/*-------------------------------------------------------------- - * GetConsoleOriginalTitleA - * - * @unimplemented - */ -DWORD -WINAPI -GetConsoleOriginalTitleA(OUT LPSTR lpConsoleTitle, - IN DWORD nSize) -{ - DPRINT1("GetConsoleOriginalTitleA(0x%p, 0x%x) UNIMPLEMENTED!\n", lpConsoleTitle, nSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/*-------------------------------------------------------------- - * GetConsoleScreenBufferInfoEx - * - * @unimplemented - */ -BOOL -WINAPI -GetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput, - OUT PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx) -{ - DPRINT1("GetConsoleScreenBufferInfoEx(0x%p, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, lpConsoleScreenBufferInfoEx); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/*-------------------------------------------------------------- - * SetConsoleScreenBufferInfoEx - * - * @unimplemented - */ -BOOL -WINAPI -SetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput, - IN PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx) -{ - DPRINT1("SetConsoleScreenBufferInfoEx(0x%p, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, lpConsoleScreenBufferInfoEx); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/*-------------------------------------------------------------- - * GetCurrentConsoleFontEx - * - * @unimplemented - */ -BOOL -WINAPI -GetCurrentConsoleFontEx(IN HANDLE hConsoleOutput, - IN BOOL bMaximumWindow, - OUT PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx) -{ - DPRINT1("GetCurrentConsoleFontEx(0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, lpConsoleCurrentFontEx); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -371,243 +371,4 @@ return FileHandle; } - -/* - * @implemented - */ -BOOLEAN -WINAPI -CreateSymbolicLinkW(IN LPCWSTR lpSymlinkFileName, - IN LPCWSTR lpTargetFileName, - IN DWORD dwFlags) -{ - IO_STATUS_BLOCK IoStatusBlock; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hSymlink = NULL; - UNICODE_STRING SymlinkFileName = { 0, 0, NULL }; - UNICODE_STRING TargetFileName = { 0, 0, NULL }; - BOOLEAN bAllocatedTarget = FALSE, bRelativePath = FALSE; - LPWSTR lpTargetFullFileName = NULL; - SIZE_T cbPrintName; - SIZE_T cbReparseData; - PREPARSE_DATA_BUFFER pReparseData = NULL; - PBYTE pBufTail; - NTSTATUS Status; - ULONG dwCreateOptions; - DWORD dwErr; - - if(!lpSymlinkFileName || !lpTargetFileName || (dwFlags | SYMBOLIC_LINK_FLAG_DIRECTORY) != SYMBOLIC_LINK_FLAG_DIRECTORY) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if(dwFlags & SYMBOLIC_LINK_FLAG_DIRECTORY) - dwCreateOptions = FILE_DIRECTORY_FILE; - else - dwCreateOptions = FILE_NON_DIRECTORY_FILE; - - switch(RtlDetermineDosPathNameType_U(lpTargetFileName)) - { - case RtlPathTypeUnknown: - case RtlPathTypeRooted: - case RtlPathTypeRelative: - bRelativePath = TRUE; - RtlInitUnicodeString(&TargetFileName, lpTargetFileName); - break; - - case RtlPathTypeDriveRelative: - { - LPWSTR FilePart; - SIZE_T cchTargetFullFileName; - - cchTargetFullFileName = GetFullPathNameW(lpTargetFileName, 0, NULL, &FilePart); - - if(cchTargetFullFileName == 0) - { - dwErr = GetLastError(); - goto Cleanup; - } - - lpTargetFullFileName = RtlAllocateHeap(RtlGetProcessHeap(), 0, cchTargetFullFileName * sizeof(WCHAR)); - - if(lpTargetFullFileName == NULL) - { - dwErr = ERROR_NOT_ENOUGH_MEMORY; - goto Cleanup; - } - - if(GetFullPathNameW(lpTargetFileName, cchTargetFullFileName, lpTargetFullFileName, &FilePart) == 0) - { - dwErr = GetLastError(); - goto Cleanup; - } - } - - lpTargetFileName = lpTargetFullFileName; - - // fallthrough - - case RtlPathTypeUncAbsolute: - case RtlPathTypeDriveAbsolute: - case RtlPathTypeLocalDevice: - case RtlPathTypeRootLocalDevice: - default: - if(!RtlDosPathNameToNtPathName_U(lpTargetFileName, &TargetFileName, NULL, NULL)) - { - bAllocatedTarget = TRUE; - dwErr = ERROR_INVALID_PARAMETER; - goto Cleanup; - } - } - - cbPrintName = wcslen(lpTargetFileName) * sizeof(WCHAR); - cbReparseData = FIELD_OFFSET(REPARSE_DATA_BUFFER, SymbolicLinkReparseBuffer.PathBuffer) + TargetFileName.Length + cbPrintName; - pReparseData = RtlAllocateHeap(RtlGetProcessHeap(), 0, cbReparseData); - - if(pReparseData == NULL) - { - dwErr = ERROR_NOT_ENOUGH_MEMORY; - goto Cleanup; - } - - pBufTail = (PBYTE)(pReparseData->SymbolicLinkReparseBuffer.PathBuffer); - - pReparseData->ReparseTag = (ULONG)IO_REPARSE_TAG_SYMLINK; - pReparseData->ReparseDataLength = (USHORT)cbReparseData - REPARSE_DATA_BUFFER_HEADER_SIZE; - pReparseData->Reserved = 0; - - pReparseData->SymbolicLinkReparseBuffer.SubstituteNameOffset = 0; - pReparseData->SymbolicLinkReparseBuffer.SubstituteNameLength = TargetFileName.Length; - pBufTail += pReparseData->SymbolicLinkReparseBuffer.SubstituteNameOffset; - RtlCopyMemory(pBufTail, TargetFileName.Buffer, TargetFileName.Length); - - pReparseData->SymbolicLinkReparseBuffer.PrintNameOffset = pReparseData->SymbolicLinkReparseBuffer.SubstituteNameLength; - pReparseData->SymbolicLinkReparseBuffer.PrintNameLength = (USHORT)cbPrintName; - pBufTail += pReparseData->SymbolicLinkReparseBuffer.PrintNameOffset; - RtlCopyMemory(pBufTail, lpTargetFileName, cbPrintName); - - pReparseData->SymbolicLinkReparseBuffer.Flags = 0; - - if(bRelativePath) - pReparseData->SymbolicLinkReparseBuffer.Flags |= 1; // TODO! give this lone flag a name - - if(!RtlDosPathNameToNtPathName_U(lpSymlinkFileName, &SymlinkFileName, NULL, NULL)) - { - dwErr = ERROR_PATH_NOT_FOUND; - goto Cleanup; - } - - InitializeObjectAttributes(&ObjectAttributes, &SymlinkFileName, OBJ_CASE_INSENSITIVE, NULL, NULL); - - Status = NtCreateFile - ( - &hSymlink, - FILE_WRITE_ATTRIBUTES | DELETE | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_CREATE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_REPARSE_POINT | dwCreateOptions, - NULL, - 0 - ); - - if(!NT_SUCCESS(Status)) - { - dwErr = RtlNtStatusToDosError(Status); - goto Cleanup; - } - - Status = NtFsControlFile - ( - hSymlink, - NULL, - NULL, - NULL, - &IoStatusBlock, - FSCTL_SET_REPARSE_POINT, - pReparseData, - cbReparseData, - NULL, - 0 - ); - - if(!NT_SUCCESS(Status)) - { - FILE_DISPOSITION_INFORMATION DispInfo; - DispInfo.DeleteFile = TRUE; - NtSetInformationFile(hSymlink, &IoStatusBlock, &DispInfo, sizeof(DispInfo), FileDispositionInformation); - - dwErr = RtlNtStatusToDosError(Status); - goto Cleanup; - } - - dwErr = NO_ERROR; - -Cleanup: - if(hSymlink) - NtClose(hSymlink); - - RtlFreeUnicodeString(&SymlinkFileName); - if (bAllocatedTarget) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - TargetFileName.Buffer); - } - - if(lpTargetFullFileName) - RtlFreeHeap(RtlGetProcessHeap(), 0, lpTargetFullFileName); - - if(pReparseData) - RtlFreeHeap(RtlGetProcessHeap(), 0, pReparseData); - - if(dwErr) - { - SetLastError(dwErr); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOLEAN -NTAPI -CreateSymbolicLinkA(IN LPCSTR lpSymlinkFileName, - IN LPCSTR lpTargetFileName, - IN DWORD dwFlags) -{ - PWCHAR SymlinkW, TargetW; - BOOLEAN Ret; - - if(!lpSymlinkFileName || !lpTargetFileName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if (!(SymlinkW = FilenameA2W(lpSymlinkFileName, FALSE))) - return FALSE; - - if (!(TargetW = FilenameA2W(lpTargetFileName, TRUE))) - return FALSE; - - Ret = CreateSymbolicLinkW(SymlinkW, - TargetW, - dwFlags); - - RtlFreeHeap(RtlGetProcessHeap(), 0, SymlinkW); - RtlFreeHeap(RtlGetProcessHeap(), 0, TargetW); - - return Ret; -} - - /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/client/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -1816,166 +1816,6 @@ return TRUE; } - -/* - * @implemented - */ -DWORD -WINAPI -GetFinalPathNameByHandleA(IN HANDLE hFile, - OUT LPSTR lpszFilePath, - IN DWORD cchFilePath, - IN DWORD dwFlags) -{ - WCHAR FilePathW[MAX_PATH]; - UNICODE_STRING FilePathU; - DWORD PrevLastError; - DWORD Ret = 0; - - if (cchFilePath != 0 && - cchFilePath > sizeof(FilePathW) / sizeof(FilePathW[0])) - { - FilePathU.Length = 0; - FilePathU.MaximumLength = (USHORT)cchFilePath * sizeof(WCHAR); - FilePathU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - FilePathU.MaximumLength); - if (FilePathU.Buffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - } - else - { - FilePathU.Length = 0; - FilePathU.MaximumLength = sizeof(FilePathW); - FilePathU.Buffer = FilePathW; - } - - /* save the last error code */ - PrevLastError = GetLastError(); - SetLastError(ERROR_SUCCESS); - - /* call the unicode version that does all the work */ - Ret = GetFinalPathNameByHandleW(hFile, - FilePathU.Buffer, - cchFilePath, - dwFlags); - - if (GetLastError() == ERROR_SUCCESS) - { - /* no error, restore the last error code and convert the string */ - SetLastError(PrevLastError); - - Ret = FilenameU2A_FitOrFail(lpszFilePath, - cchFilePath, - &FilePathU); - } - - /* free allocated memory if necessary */ - if (FilePathU.Buffer != FilePathW) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - FilePathU.Buffer); - } - - return Ret; -} - - -/* - * @unimplemented - */ -DWORD -WINAPI -GetFinalPathNameByHandleW(IN HANDLE hFile, - OUT LPWSTR lpszFilePath, - IN DWORD cchFilePath, - IN DWORD dwFlags) -{ - if (dwFlags & ~(VOLUME_NAME_DOS | VOLUME_NAME_GUID | VOLUME_NAME_NT | - VOLUME_NAME_NONE | FILE_NAME_NORMALIZED | FILE_NAME_OPENED)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - UNIMPLEMENTED; - return 0; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -SetFileBandwidthReservation(IN HANDLE hFile, - IN DWORD nPeriodMilliseconds, - IN DWORD nBytesPerPeriod, - IN BOOL bDiscardable, - OUT LPDWORD lpTransferSize, - OUT LPDWORD lpNumOutstandingRequests) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -GetFileBandwidthReservation(IN HANDLE hFile, - OUT LPDWORD lpPeriodMilliseconds, - OUT LPDWORD lpBytesPerPeriod, - OUT LPBOOL pDiscardable, - OUT LPDWORD lpTransferSize, - OUT LPDWORD lpNumOutstandingRequests) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -SetFileCompletionNotificationModes(IN HANDLE FileHandle, - IN UCHAR Flags) -{ - if (Flags & ~(FILE_SKIP_COMPLETION_PORT_ON_SUCCESS | FILE_SKIP_SET_EVENT_ON_HANDLE)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -HANDLE -WINAPI -OpenFileById(IN HANDLE hFile, - IN LPFILE_ID_DESCRIPTOR lpFileID, - IN DWORD dwDesiredAccess, - IN DWORD dwShareMode, - IN LPSECURITY_ATTRIBUTES lpSecurityAttributes OPTIONAL, - IN DWORD dwFlags) -{ - UNIMPLEMENTED; - return INVALID_HANDLE_VALUE; -} - /* * @implemented */ Modified: trunk/reactos/dll/win32/kernel32/client/misc/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/comm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/comm.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -59,6 +59,9 @@ #include "wine/debug.h" +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(comm); /*********************************************************************** Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -52,6 +52,10 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "winternl.h" +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(file); /* The readahead length of the decompressor. Reading single bytes Modified: trunk/reactos/dll/win32/kernel32/client/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/profile.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -34,6 +34,9 @@ #include "wine/library.h" #include "wine/debug.h" +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(profile); static const char bom_utf8[] = {0xEF,0xBB,0xBF}; Modified: trunk/reactos/dll/win32/kernel32/client/misc/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/res.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/res.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -37,6 +37,9 @@ #include "wine/unicode.h" #include "wine/list.h" +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(resource); /* we don't want to include winuser.h just for this */ Modified: trunk/reactos/dll/win32/kernel32/client/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/time.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -602,39 +602,23 @@ WINAPI GetTickCount(VOID) { - /* Call the 64-bit version */ - return (DWORD)GetTickCount64(); -} - - -/* - * @implemented - */ -ULONGLONG -WINAPI -GetTickCount64(VOID) -{ - ULONG Multiplier; - LARGE_INTEGER TickCount; - - /* Loop until we get a perfect match */ - for (;;) - { - /* Read the tick count value */ - TickCount.HighPart = SharedUserData->TickCount.High1Time; + ULARGE_INTEGER TickCount; + + while (TRUE) + { + TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; TickCount.LowPart = SharedUserData->TickCount.LowPart; - if (TickCount.HighPart == SharedUserData->TickCount.High2Time) break; + + if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) + break; + YieldProcessor(); } - /* Get the multiplier */ - Multiplier = SharedUserData->TickCountMultiplier; - - /* Convert to milliseconds and return */ - return (Int64ShrlMod32(UInt32x32To64(Multiplier, TickCount.LowPart), 24) + - (Multiplier * (TickCount.HighPart << 8))); -} - + return (ULONG)((UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + + UInt32x32To64((TickCount.HighPart << 8) & 0xFFFFFFFF, SharedUserData->TickCountMultiplier)); + +} /* * @implemented Modified: trunk/reactos/dll/win32/kernel32/client/synch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -7,7 +7,8 @@ */ /* INCLUDES *****************************************************************/ - +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x600 #include <k32.h> #define NDEBUG Modified: trunk/reactos/dll/win32/kernel32/client/vista.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -8,6 +8,8 @@ #define NDEBUG #include <debug.h> + +#if _WIN32_WINNT >= 0x600 /* FIXME: Move these RTL declarations to the NDK */ NTSTATUS @@ -307,3 +309,563 @@ return E_FAIL; } +/* + * @implemented + */ +ULONGLONG +WINAPI +GetTickCount64(VOID) +{ + ULARGE_INTEGER TickCount; + + while (TRUE) + { + TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; + TickCount.LowPart = SharedUserData->TickCount.LowPart; + + if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) break; + + YieldProcessor(); + } + + return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + + (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8); +} + +/*-------------------------------------------------------------- + * GetConsoleHistoryInfo + * + * @implemented + */ +BOOL +WINAPI +GetConsoleHistoryInfo(PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) +{ + CSR_API_MESSAGE Request; + ULONG CsrRequest = MAKE_CSR_API(GET_HISTORY_INFO, CSR_CONSOLE); + NTSTATUS Status; + if (lpConsoleHistoryInfo->cbSize != sizeof(CONSOLE_HISTORY_INFO)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + Status = CsrClientCallServer(&Request, NULL, CsrRequest, sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + lpConsoleHistoryInfo->HistoryBufferSize = Request.Data.GetHistoryInfo.HistoryBufferSize; + lpConsoleHistoryInfo->NumberOfHistoryBuffers = Request.Data.GetHistoryInfo.NumberOfHistoryBuffers; + lpConsoleHistoryInfo->dwFlags = Request.Data.GetHistoryInfo.dwFlags; + return TRUE; +} + + +/*-------------------------------------------------------------- + * SetConsoleHistoryInfo + * + * @implemented + */ +BOOL +WINAPI +SetConsoleHistoryInfo(IN PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) +{ + CSR_API_MESSAGE Request; + ULONG CsrRequest = MAKE_CSR_API(GET_HISTORY_INFO, CSR_CONSOLE); + NTSTATUS Status; + if (lpConsoleHistoryInfo->cbSize != sizeof(CONSOLE_HISTORY_INFO)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + Request.Data.SetHistoryInfo.HistoryBufferSize = lpConsoleHistoryInfo->HistoryBufferSize; + Request.Data.SetHistoryInfo.NumberOfHistoryBuffers = lpConsoleHistoryInfo->NumberOfHistoryBuffers; + Request.Data.SetHistoryInfo.dwFlags = lpConsoleHistoryInfo->dwFlags; + Status = CsrClientCallServer(&Request, NULL, CsrRequest, sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + return TRUE; +} + + +/*-------------------------------------------------------------- + * GetConsoleOriginalTitleW + * + * @unimplemented + */ +DWORD +WINAPI +GetConsoleOriginalTitleW(OUT LPWSTR lpConsoleTitle, + IN DWORD nSize) +{ + DPRINT1("GetConsoleOriginalTitleW(0x%p, 0x%x) UNIMPLEMENTED!\n", lpConsoleTitle, nSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/*-------------------------------------------------------------- + * GetConsoleOriginalTitleA + * + * @unimplemented + */ +DWORD +WINAPI +GetConsoleOriginalTitleA(OUT LPSTR lpConsoleTitle, + IN DWORD nSize) +{ + DPRINT1("GetConsoleOriginalTitleA(0x%p, 0x%x) UNIMPLEMENTED!\n", lpConsoleTitle, nSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/*-------------------------------------------------------------- + * GetConsoleScreenBufferInfoEx + * + * @unimplemented + */ +BOOL +WINAPI +GetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput, + OUT PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx) +{ + DPRINT1("GetConsoleScreenBufferInfoEx(0x%p, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, lpConsoleScreenBufferInfoEx); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/*-------------------------------------------------------------- + * SetConsoleScreenBufferInfoEx + * + * @unimplemented + */ +BOOL +WINAPI +SetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput, + IN PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx) +{ + DPRINT1("SetConsoleScreenBufferInfoEx(0x%p, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, lpConsoleScreenBufferInfoEx); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/*-------------------------------------------------------------- + * GetCurrentConsoleFontEx + * + * @unimplemented + */ +BOOL +WINAPI +GetCurrentConsoleFontEx(IN HANDLE hConsoleOutput, + IN BOOL bMaximumWindow, + OUT PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx) +{ + DPRINT1("GetCurrentConsoleFontEx(0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, lpConsoleCurrentFontEx); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @implemented + */ +BOOLEAN +WINAPI +CreateSymbolicLinkW(IN LPCWSTR lpSymlinkFileName, + IN LPCWSTR lpTargetFileName, + IN DWORD dwFlags) +{ + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hSymlink = NULL; + UNICODE_STRING SymlinkFileName = { 0, 0, NULL }; + UNICODE_STRING TargetFileName = { 0, 0, NULL }; + BOOLEAN bAllocatedTarget = FALSE, bRelativePath = FALSE; + LPWSTR lpTargetFullFileName = NULL; + SIZE_T cbPrintName; + SIZE_T cbReparseData; + PREPARSE_DATA_BUFFER pReparseData = NULL; + PBYTE pBufTail; + NTSTATUS Status; + ULONG dwCreateOptions; + DWORD dwErr; + + if(!lpSymlinkFileName || !lpTargetFileName || (dwFlags | SYMBOLIC_LINK_FLAG_DIRECTORY) != SYMBOLIC_LINK_FLAG_DIRECTORY) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if(dwFlags & SYMBOLIC_LINK_FLAG_DIRECTORY) + dwCreateOptions = FILE_DIRECTORY_FILE; + else + dwCreateOptions = FILE_NON_DIRECTORY_FILE; + + switch(RtlDetermineDosPathNameType_U(lpTargetFileName)) + { + case RtlPathTypeUnknown: + case RtlPathTypeRooted: + case RtlPathTypeRelative: + bRelativePath = TRUE; + RtlInitUnicodeString(&TargetFileName, lpTargetFileName); + break; + + case RtlPathTypeDriveRelative: + { + LPWSTR FilePart; + SIZE_T cchTargetFullFileName; + + cchTargetFullFileName = GetFullPathNameW(lpTargetFileName, 0, NULL, &FilePart); + + if(cchTargetFullFileName == 0) + { + dwErr = GetLastError(); + goto Cleanup; + } + + lpTargetFullFileName = RtlAllocateHeap(RtlGetProcessHeap(), 0, cchTargetFullFileName * sizeof(WCHAR)); + + if(lpTargetFullFileName == NULL) + { + dwErr = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + + if(GetFullPathNameW(lpTargetFileName, cchTargetFullFileName, lpTargetFullFileName, &FilePart) == 0) + { + dwErr = GetLastError(); + goto Cleanup; + } + } + + lpTargetFileName = lpTargetFullFileName; + + // fallthrough + + case RtlPathTypeUncAbsolute: + case RtlPathTypeDriveAbsolute: + case RtlPathTypeLocalDevice: + case RtlPathTypeRootLocalDevice: + default: + if(!RtlDosPathNameToNtPathName_U(lpTargetFileName, &TargetFileName, NULL, NULL)) + { + bAllocatedTarget = TRUE; + dwErr = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + } + + cbPrintName = wcslen(lpTargetFileName) * sizeof(WCHAR); + cbReparseData = FIELD_OFFSET(REPARSE_DATA_BUFFER, SymbolicLinkReparseBuffer.PathBuffer) + TargetFileName.Length + cbPrintName; + pReparseData = RtlAllocateHeap(RtlGetProcessHeap(), 0, cbReparseData); + + if(pReparseData == NULL) + { + dwErr = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + + pBufTail = (PBYTE)(pReparseData->SymbolicLinkReparseBuffer.PathBuffer); + + pReparseData->ReparseTag = (ULONG)IO_REPARSE_TAG_SYMLINK; + pReparseData->ReparseDataLength = (USHORT)cbReparseData - REPARSE_DATA_BUFFER_HEADER_SIZE; + pReparseData->Reserved = 0; + + pReparseData->SymbolicLinkReparseBuffer.SubstituteNameOffset = 0; + pReparseData->SymbolicLinkReparseBuffer.SubstituteNameLength = TargetFileName.Length; + pBufTail += pReparseData->SymbolicLinkReparseBuffer.SubstituteNameOffset; + RtlCopyMemory(pBufTail, TargetFileName.Buffer, TargetFileName.Length); + + pReparseData->SymbolicLinkReparseBuffer.PrintNameOffset = pReparseData->SymbolicLinkReparseBuffer.SubstituteNameLength; + pReparseData->SymbolicLinkReparseBuffer.PrintNameLength = (USHORT)cbPrintName; + pBufTail += pReparseData->SymbolicLinkReparseBuffer.PrintNameOffset; + RtlCopyMemory(pBufTail, lpTargetFileName, cbPrintName); + + pReparseData->SymbolicLinkReparseBuffer.Flags = 0; + + if(bRelativePath) + pReparseData->SymbolicLinkReparseBuffer.Flags |= 1; // TODO! give this lone flag a name + + if(!RtlDosPathNameToNtPathName_U(lpSymlinkFileName, &SymlinkFileName, NULL, NULL)) + { + dwErr = ERROR_PATH_NOT_FOUND; + goto Cleanup; + } + + InitializeObjectAttributes(&ObjectAttributes, &SymlinkFileName, OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = NtCreateFile + ( + &hSymlink, + FILE_WRITE_ATTRIBUTES | DELETE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_CREATE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_REPARSE_POINT | dwCreateOptions, + NULL, + 0 + ); + + if(!NT_SUCCESS(Status)) + { + dwErr = RtlNtStatusToDosError(Status); + goto Cleanup; + } + + Status = NtFsControlFile + ( + hSymlink, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_SET_REPARSE_POINT, + pReparseData, + cbReparseData, + NULL, + 0 + ); + + if(!NT_SUCCESS(Status)) + { + FILE_DISPOSITION_INFORMATION DispInfo; + DispInfo.DeleteFile = TRUE; + NtSetInformationFile(hSymlink, &IoStatusBlock, &DispInfo, sizeof(DispInfo), FileDispositionInformation); + + dwErr = RtlNtStatusToDosError(Status); + goto Cleanup; + } + + dwErr = NO_ERROR; + +Cleanup: + if(hSymlink) + NtClose(hSymlink); + + RtlFreeUnicodeString(&SymlinkFileName); + if (bAllocatedTarget) + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + TargetFileName.Buffer); + } + + if(lpTargetFullFileName) + RtlFreeHeap(RtlGetProcessHeap(), 0, lpTargetFullFileName); + + if(pReparseData) + RtlFreeHeap(RtlGetProcessHeap(), 0, pReparseData); + + if(dwErr) + { + SetLastError(dwErr); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOLEAN +NTAPI +CreateSymbolicLinkA(IN LPCSTR lpSymlinkFileName, + IN LPCSTR lpTargetFileName, + IN DWORD dwFlags) +{ + PWCHAR SymlinkW, TargetW; + BOOLEAN Ret; + + if(!lpSymlinkFileName || !lpTargetFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!(SymlinkW = FilenameA2W(lpSymlinkFileName, FALSE))) + return FALSE; + + if (!(TargetW = FilenameA2W(lpTargetFileName, TRUE))) + return FALSE; + + Ret = CreateSymbolicLinkW(SymlinkW, + TargetW, + dwFlags); + + RtlFreeHeap(RtlGetProcessHeap(), 0, SymlinkW); + RtlFreeHeap(RtlGetProcessHeap(), 0, TargetW); + + return Ret; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +GetFinalPathNameByHandleW(IN HANDLE hFile, + OUT LPWSTR lpszFilePath, + IN DWORD cchFilePath, + IN DWORD dwFlags) +{ + if (dwFlags & ~(VOLUME_NAME_DOS | VOLUME_NAME_GUID | VOLUME_NAME_NT | + VOLUME_NAME_NONE | FILE_NAME_NORMALIZED | FILE_NAME_OPENED)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + UNIMPLEMENTED; + return 0; +} + +/* + * @implemented + */ +DWORD +WINAPI +GetFinalPathNameByHandleA(IN HANDLE hFile, + OUT LPSTR lpszFilePath, + IN DWORD cchFilePath, + IN DWORD dwFlags) +{ + WCHAR FilePathW[MAX_PATH]; + UNICODE_STRING FilePathU; + DWORD PrevLastError; + DWORD Ret = 0; + + if (cchFilePath != 0 && + cchFilePath > sizeof(FilePathW) / sizeof(FilePathW[0])) + { + FilePathU.Length = 0; + FilePathU.MaximumLength = (USHORT)cchFilePath * sizeof(WCHAR); + FilePathU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + FilePathU.MaximumLength); + if (FilePathU.Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + else + { + FilePathU.Length = 0; + FilePathU.MaximumLength = sizeof(FilePathW); + FilePathU.Buffer = FilePathW; + } + + /* save the last error code */ + PrevLastError = GetLastError(); + SetLastError(ERROR_SUCCESS); + + /* call the unicode version that does all the work */ + Ret = GetFinalPathNameByHandleW(hFile, + FilePathU.Buffer, + cchFilePath, + dwFlags); + + if (GetLastError() == ERROR_SUCCESS) + { + /* no error, restore the last error code and convert the string */ + SetLastError(PrevLastError); + + Ret = FilenameU2A_FitOrFail(lpszFilePath, + cchFilePath, + &FilePathU); + } + + /* free allocated memory if necessary */ + if (FilePathU.Buffer != FilePathW) + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FilePathU.Buffer); + } + + return Ret; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetFileBandwidthReservation(IN HANDLE hFile, + IN DWORD nPeriodMilliseconds, + IN DWORD nBytesPerPeriod, + IN BOOL bDiscardable, + OUT LPDWORD lpTransferSize, + OUT LPDWORD lpNumOutstandingRequests) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +GetFileBandwidthReservation(IN HANDLE hFile, + OUT LPDWORD lpPeriodMilliseconds, + OUT LPDWORD lpBytesPerPeriod, + OUT LPBOOL pDiscardable, + OUT LPDWORD lpTransferSize, + OUT LPDWORD lpNumOutstandingRequests) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +SetFileCompletionNotificationModes(IN HANDLE FileHandle, + IN UCHAR Flags) +{ + if (Flags & ~(FILE_SKIP_COMPLETION_PORT_ON_SUCCESS | FILE_SKIP_SET_EVENT_ON_HANDLE)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +HANDLE +WINAPI +OpenFileById(IN HANDLE hFile, + IN LPFILE_ID_DESCRIPTOR lpFileID, + IN DWORD dwDesiredAccess, + IN DWORD dwShareMode, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes OPTIONAL, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return INVALID_HANDLE_VALUE; +} + +#endif + Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -186,10 +186,8 @@ @ stdcall CreateSemaphoreExW(ptr long long wstr long long) @ stdcall CreateSemaphoreW(ptr long long wstr) @ stdcall CreateSocketHandle() -@ stdcall CreateSymbolicLinkA(str str long) ;@ stdcall CreateSymbolicLinkTransactedA ; Win 7 ;@ stdcall CreateSymbolicLinkTransactedW ; Win 7 -@ stdcall CreateSymbolicLinkW(wstr wstr long) @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) ;@ stdcall CreateThreadpool ; Win 7 @@ -441,7 +439,6 @@ @ stdcall GetConsoleFontInfo(long long long ptr) @ stdcall GetConsoleFontSize(long long) @ stdcall GetConsoleHardwareState(long long ptr) -@ stdcall GetConsoleHistoryInfo(ptr) @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleInputWaitHandle() @@ -514,7 +511,6 @@ ;@ stdcall GetFileAttributesTransactedA ; Win 7 ;@ stdcall GetFileAttributesTransactedW ; Win 7 @ stdcall GetFileAttributesW(wstr) -@ stdcall GetFileBandwidthReservation(long ptr ptr ptr ptr ptr) @ stdcall GetFileInformationByHandle(long ptr) ;@ stdcall GetFileInformationByHandleEx ; Win 7 ;@ stdcall GetFileMUIInfo ; Win 7 @@ -523,8 +519,6 @@ @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) @ stdcall GetFileType(long) -@ stdcall GetFinalPathNameByHandleA(long str long long) -@ stdcall GetFinalPathNameByHandleW(long wstr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall GetFullPathNameA(str long ptr ptr) @@ -693,7 +687,7 @@ @ stdcall GetThreadTimes(long ptr ptr ptr ptr) ;@ stdcall GetThreadUILanguage ; Win 7 @ stdcall GetTickCount() -@ stdcall -ret64 GetTickCount64() +@ stdcall GetTickCount64() ; FOR WINE @ stdcall GetTimeFormatA(long long ptr str ptr long) ;@ stdcall GetTimeFormatEx ; Win 7 @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @@ -1144,7 +1138,6 @@ @ stdcall SetConsoleDisplayMode(long long ptr) @ stdcall SetConsoleFont(long long) @ stdcall SetConsoleHardwareState(long long long) -@ stdcall SetConsoleHistoryInfo(ptr) @ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr) @ stdcall SetConsoleInputExeNameW(ptr) Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -10,7 +10,6 @@ <library>wine</library> <library>ntdll</library> <define name="_KERNEL32_" /> - <redefine name="_WIN32_WINNT">0x0600</redefine> <dependency>errcodes</dependency> <pch>k32.h</pch> <directory name="client"> Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -184,10 +184,8 @@ @ stdcall CreateSemaphoreExW(ptr long long wstr long long) @ stdcall CreateSemaphoreW(ptr long long wstr) @ stdcall CreateSocketHandle() -@ stdcall CreateSymbolicLinkA(str str long) ;@ stdcall CreateSymbolicLinkTransactedA ; Win 7 ;@ stdcall CreateSymbolicLinkTransactedW ; Win 7 -@ stdcall CreateSymbolicLinkW(wstr wstr long) @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) ;@ stdcall CreateThreadpool ; Win 7 @@ -439,7 +437,6 @@ @ stdcall GetConsoleFontInfo(long long long ptr) @ stdcall GetConsoleFontSize(long long) @ stdcall GetConsoleHardwareState(long long ptr) -@ stdcall GetConsoleHistoryInfo(ptr) @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleInputWaitHandle() @@ -512,7 +509,6 @@ ;@ stdcall GetFileAttributesTransactedA ; Win 7 ;@ stdcall GetFileAttributesTransactedW ; Win 7 @ stdcall GetFileAttributesW(wstr) -@ stdcall GetFileBandwidthReservation(long ptr ptr ptr ptr ptr) @ stdcall GetFileInformationByHandle(long ptr) ;@ stdcall GetFileInformationByHandleEx ; Win 7 ;@ stdcall GetFileMUIInfo ; Win 7 @@ -521,8 +517,6 @@ @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) @ stdcall GetFileType(long) -@ stdcall GetFinalPathNameByHandleA(long str long long) -@ stdcall GetFinalPathNameByHandleW(long wstr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall GetFullPathNameA(str long ptr ptr) @@ -691,7 +685,7 @@ @ stdcall GetThreadTimes(long ptr ptr ptr ptr) ;@ stdcall GetThreadUILanguage ; Win 7 @ stdcall GetTickCount() -@ stdcall -ret64 GetTickCount64() +@ stdcall GetTickCount64() ; FOR WINE @ stdcall GetTimeFormatA(long long ptr str ptr long) ;@ stdcall GetTimeFormatEx ; Win 7 @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @@ -1142,7 +1136,6 @@ @ stdcall SetConsoleDisplayMode(long long ptr) @ stdcall SetConsoleFont(long long) @ stdcall SetConsoleHardwareState(long long long) -@ stdcall SetConsoleHistoryInfo(ptr) @ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr) @ stdcall SetConsoleInputExeNameW(ptr) Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -36,6 +36,9 @@ extern HMODULE kernel32_handle; +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(resource); struct format_args Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -55,6 +55,9 @@ return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; } +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(nls); extern HMODULE kernel32_handle; Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -39,6 +39,10 @@ #define CRITICAL_SECTION RTL_CRITICAL_SECTION #define CRITICAL_SECTION_DEBUG RTL_CRITICAL_SECTION_DEBUG #define CALINFO_MAX_YEAR 2029 + +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(nls);

1 0

[ion] 52760: [NLS]: Kill this directory from the build. It produced nothing other than a Vista-calling DLL which was never even on the BootCD. [KERNEL32]: Remove GetLocaleInfoEx again. [KERNEL32]: ...
by ion＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: ion Date: Thu Jul 21 15:39:28 2011 New Revision: 52760 URL: http://svn.reactos.org/svn/reactos?rev=52760&view=rev Log: [NLS]: Kill this directory from the build. It produced nothing other than a Vista-calling DLL which was never even on the BootCD. [KERNEL32]: Remove GetLocaleInfoEx again. [KERNEL32]: It seems CMAKE build doesn't like kernel32 code calling "HeapAlloc" because HeapAlloc doesn't exist -- it's a forward to RtlAllocateHeap. As a hack, add compiler defines to do the forwarding in C code as well. Modified: trunk/reactos/dll/CMakeLists.txt trunk/reactos/dll/dll.rbuild trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/kernel32.pspec Modified: trunk/reactos/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/CMakeLists.txt?rev=527… ============================================================================== --- trunk/reactos/dll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/CMakeLists.txt [iso-8859-1] Thu Jul 21 15:39:28 2011 @@ -3,7 +3,6 @@ add_subdirectory(cpl) add_subdirectory(directx) add_subdirectory(keyboard) -add_subdirectory(nls) add_subdirectory(ntdll) add_subdirectory(shellext) add_subdirectory(win32) Modified: trunk/reactos/dll/dll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/dll.rbuild?rev=52760&r… ============================================================================== --- trunk/reactos/dll/dll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/dll.rbuild [iso-8859-1] Thu Jul 21 15:39:28 2011 @@ -13,9 +13,6 @@ <directory name="keyboard"> <xi:include href="keyboard/keyboard.rbuild" /> </directory> -<directory name="nls"> - <xi:include href="nls/nls.rbuild" /> -</directory> <directory name="ntdll"> <xi:include href="ntdll/ntdll.rbuild" /> </directory> Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Thu Jul 21 15:39:28 2011 @@ -1,5 +1,9 @@ add_definitions(-D_KERNEL32_) + +add_definitions(-DHeapAlloc=RtlAllocateHeap) +add_definitions(-DHeapFree=RtlFreeHeap) +add_definitions(-DGetProcessHeap=RtlGetProcessHeap) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Jul 21 15:39:28 2011 @@ -544,7 +544,6 @@ @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) @ stdcall GetLocaleInfoW(long long ptr long) -@ stdcall GetLocaleInfoEx(wstr long wstr long) ; Vista+ @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @ stdcall GetLogicalDrives()

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs