Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 52438: [MSAFD] - Fail SIO_GET_EXTENSION_FUNCTION_POINTER - Fixes the crash during ws2_32_winetest sock - In my testing, "sock: 4374916 tests executed (0 marked as todo, 93 failures), 6 sk...
by cgutman＠svn.reactos.org 24 Jun '11

24 Jun '11

Author: cgutman Date: Fri Jun 24 04:31:31 2011 New Revision: 52438 URL: http://svn.reactos.org/svn/reactos?rev=52438&view=rev Log: [MSAFD] - Fail SIO_GET_EXTENSION_FUNCTION_POINTER - Fixes the crash during ws2_32_winetest sock - In my testing, "sock: 4374916 tests executed (0 marked as todo, 93 failures), 6 skipped." Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri Jun 24 04:31:31 2011 @@ -1986,6 +1986,9 @@ *lpcbBytesReturned = sizeof(ULONG); return NO_ERROR; } + case SIO_GET_EXTENSION_FUNCTION_POINTER: + *lpErrno = WSAEINVAL; + return SOCKET_ERROR; default: *lpErrno = Socket->HelperData->WSHIoctl(Socket->HelperContext, Handle,

1 0

[cgutman] 52437: [IP] - Fix copying of the remote address when satisfying an accept request - accept() and WSAAccept() no longer report strange peer addresses - Fixes a few ws2_32_winetest sock tests
by cgutman＠svn.reactos.org 24 Jun '11

24 Jun '11

Author: cgutman Date: Fri Jun 24 03:35:30 2011 New Revision: 52437 URL: http://svn.reactos.org/svn/reactos?rev=52437&view=rev Log: [IP] - Fix copying of the remote address when satisfying an accept request - accept() and WSAAccept() no longer report strange peer addresses - Fixes a few ws2_32_winetest sock tests Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Fri Jun 24 03:35:30 2011 @@ -39,24 +39,19 @@ TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); if( NT_SUCCESS(Status) && Status != STATUS_PENDING ) { - RequestAddressReturn = WhoIsConnecting->RemoteAddress; + RequestAddressReturn = WhoIsConnecting->RemoteAddress; - TI_DbgPrint(DEBUG_TCP,("Copying address to %x (Who %x)\n", - RequestAddressReturn, WhoIsConnecting)); + TI_DbgPrint(DEBUG_TCP,("Copying address to %x (Who %x)\n", + RequestAddressReturn, WhoIsConnecting)); RequestAddressReturn->TAAddressCount = 1; - RequestAddressReturn->Address[0].AddressLength = OutAddrLen; + RequestAddressReturn->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; + RequestAddressReturn->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; + RequestAddressReturn->Address[0].Address[0].sin_port = OutAddr.sin_port; + RequestAddressReturn->Address[0].Address[0].in_addr = OutAddr.sin_addr.s_addr; + RtlZeroMemory(RequestAddressReturn->Address[0].Address[0].sin_zero, 8); - /* BSD uses the first byte of the sockaddr struct as a length. - * Since windows doesn't do that we strip it */ - RequestAddressReturn->Address[0].AddressType = - (OutAddr.sin_family >> 8) & 0xff; - - RtlCopyMemory( &RequestAddressReturn->Address[0].Address, - ((PCHAR)&OutAddr) + sizeof(USHORT), - sizeof(RequestAddressReturn->Address[0].Address[0]) ); - - TI_DbgPrint(DEBUG_TCP,("Done copying\n")); + TI_DbgPrint(DEBUG_TCP,("Done copying\n")); } TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status));

1 0

[cgutman] 52436: [VFATLIB] - Don't overwrite format status with lock status
by cgutman＠svn.reactos.org 24 Jun '11

24 Jun '11

Author: cgutman Date: Fri Jun 24 01:36:32 2011 New Revision: 52436 URL: http://svn.reactos.org/svn/reactos?rev=52436&view=rev Log: [VFATLIB] - Don't overwrite format status with lock status Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Fri Jun 24 01:36:32 2011 @@ -32,7 +32,7 @@ HANDLE FileHandle; PARTITION_INFORMATION PartitionInfo; FORMAT_CONTEXT Context; - NTSTATUS Status; + NTSTATUS Status, LockStatus; DPRINT("VfatFormat(DriveRoot '%wZ')\n", DriveRoot); @@ -194,20 +194,20 @@ Context.Percent = 0; Callback (PROGRESS, 0, (PVOID)&Context.Percent); } - - Status = NtFsControlFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - FSCTL_LOCK_VOLUME, - NULL, - 0, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("WARNING: Failed to lock volume for formatting! Format may fail! (Status: 0x%x)\n", Status); + + LockStatus = NtFsControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + FSCTL_LOCK_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(LockStatus)) + { + DPRINT1("WARNING: Failed to lock volume for formatting! Format may fail! (Status: 0x%x)\n", LockStatus); } if (PartitionInfo.PartitionType == PARTITION_FAT_12) @@ -250,20 +250,20 @@ { Status = STATUS_INVALID_PARAMETER; } - - Status = NtFsControlFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - FSCTL_UNLOCK_VOLUME, - NULL, - 0, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to unlock volume (Status: 0x%x)\n", Status); + + LockStatus = NtFsControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + FSCTL_UNLOCK_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(LockStatus)) + { + DPRINT1("Failed to unlock volume (Status: 0x%x)\n", LockStatus); } NtClose(FileHandle);

1 0

[cgutman] 52435: [VFATLIB] - Lock the volume before formatting to prevent concurrent access during formatting - This should (in theory) fix our formatting issue on mounted devices but currently we ...
by cgutman＠svn.reactos.org 23 Jun '11

23 Jun '11

Author: cgutman Date: Thu Jun 23 22:34:03 2011 New Revision: 52435 URL: http://svn.reactos.org/svn/reactos?rev=52435&view=rev Log: [VFATLIB] - Lock the volume before formatting to prevent concurrent access during formatting - This should (in theory) fix our formatting issue on mounted devices but currently we don't support FSCTL_LOCK_VOLUME in our FS drivers Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Thu Jun 23 22:34:03 2011 @@ -194,6 +194,21 @@ Context.Percent = 0; Callback (PROGRESS, 0, (PVOID)&Context.Percent); } + + Status = NtFsControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + FSCTL_LOCK_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WARNING: Failed to lock volume for formatting! Format may fail! (Status: 0x%x)\n", Status); + } if (PartitionInfo.PartitionType == PARTITION_FAT_12) { @@ -234,6 +249,21 @@ else { Status = STATUS_INVALID_PARAMETER; + } + + Status = NtFsControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + FSCTL_UNLOCK_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to unlock volume (Status: 0x%x)\n", Status); } NtClose(FileHandle);

1 0

[jimtabor] 52434: - Fix debug build.
by jimtabor＠svn.reactos.org 23 Jun '11

23 Jun '11

Author: jimtabor Date: Thu Jun 23 22:25:50 2011 New Revision: 52434 URL: http://svn.reactos.org/svn/reactos?rev=52434&view=rev Log: - Fix debug build. Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Thu Jun 23 22:25:50 2011 @@ -440,7 +440,7 @@ ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND])); ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_RECV])); ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_PREACCEPT])); - ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_DISCONNECT])) + ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_DISCONNECT])); while (!IsListEmpty(&FCB->PendingConnections)) {

1 0

[spetreolle] 52433: [CMAKE] Fix mshtml.tlb build with Visual Studio. With mshtml_tlb and mshtml.tlb targets, the solution contained 2 mshtml_tlb targets.
by spetreolle＠svn.reactos.org 23 Jun '11

23 Jun '11

Author: spetreolle Date: Thu Jun 23 09:41:36 2011 New Revision: 52433 URL: http://svn.reactos.org/svn/reactos?rev=52433&view=rev Log: [CMAKE] Fix mshtml.tlb build with Visual Studio. With mshtml_tlb and mshtml.tlb targets, the solution contained 2 mshtml_tlb targets. Modified: trunk/reactos/dll/win32/mshtml.tlb/CMakeLists.txt Modified: trunk/reactos/dll/win32/mshtml.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml.tlb/CMake… ============================================================================== --- trunk/reactos/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] Thu Jun 23 09:41:36 2011 @@ -1,6 +1,6 @@ -add_typelib(mshtml_tlb mshtml_tlb.idl) -add_dependencies(mshtml_tlb stdole2) +add_typelib(mshtml__tlb mshtml_tlb.idl) +add_dependencies(mshtml__tlb stdole2) add_definitions(-D__WINESRC__) @@ -10,5 +10,5 @@ set_entrypoint(mshtml.tlb 0) set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") -add_dependencies(mshtml.tlb mshtml_tlb) +add_dependencies(mshtml.tlb mshtml__tlb) add_cd_file(TARGET mshtml.tlb DESTINATION reactos/system32 FOR all)

1 0

[cmihail] 52432: [TCPIP] Backup commit
by cmihail＠svn.reactos.org 23 Jun '11

23 Jun '11

Author: cmihail Date: Thu Jun 23 07:57:59 2011 New Revision: 52432 URL: http://svn.reactos.org/svn/reactos?rev=52432&view=rev Log: [TCPIP] Backup commit Modified: branches/GSoC_2011/TcpIpDriver/drivers/CMakeLists.txt 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/src/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/C… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/CMakeLists.txt [iso-8859-1] Thu Jun 23 07:57:59 2011 @@ -14,4 +14,4 @@ add_subdirectory(usb) add_subdirectory(video) add_subdirectory(wdm) -add_subdirectory(wmi) +add_subdirectory(wmi) 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 Jun 23 07:57:59 2011 @@ -41,9 +41,9 @@ Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); + DereferenceObject(Bucket->AssociatedEndpoint); + ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); - - DereferenceObject(Bucket->AssociatedEndpoint); } static 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 Jun 23 07:57:59 2011 @@ -302,6 +302,18 @@ if (NT_SUCCESS(Status)) { connaddr.addr = RemoteAddress.Address.IPv4Address; + + Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); + if( !Bucket ) + { + UnlockObject(Connection, OldIrql); + return STATUS_NO_MEMORY; + } + + Bucket->Request.RequestNotifyObject = (PVOID)Complete; + Bucket->Request.RequestContext = Context; + + InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); Status = TCPTranslateError(LibTCPConnect(Connection->SocketContext, &connaddr, @@ -311,7 +323,7 @@ if (Status == STATUS_PENDING) { - Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); + /*Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); if( !Bucket ) { UnlockObject(Connection, OldIrql); @@ -321,7 +333,7 @@ Bucket->Request.RequestNotifyObject = (PVOID)Complete; Bucket->Request.RequestContext = Context; - InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); + InsertTailList( &Connection->ConnectRequest, &Bucket->Entry );*/ } } @@ -390,6 +402,9 @@ TI_DbgPrint(DEBUG_TCP,("[IP, TCPReceiveData] Called for %d bytes (on socket %x)\n", ReceiveLength, Connection->SocketContext)); + DbgPrint("[IP, TCPReceiveData] Called for %d bytes (on Connection->SocketContext = 0x%x)\n", + ReceiveLength, Connection->SocketContext); + LockObject(Connection, &OldIrql); /* Freed in TCPSocketState */ @@ -412,6 +427,7 @@ UnlockObject(Connection, OldIrql); TI_DbgPrint(DEBUG_TCP,("[IP, TCPReceiveData] Leaving. Status = STATUS_PENDING\n")); + DbgPrint("[IP, TCPReceiveData] Leaving. Status = STATUS_PENDING\n"); return STATUS_PENDING; } @@ -437,6 +453,7 @@ TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Connection = %x\n", Connection)); TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Connection->SocketContext = %x\n", Connection->SocketContext)); + DbgPrint("[IP, TCPSendData] Called\n"); Status = TCPTranslateError(LibTCPSend(Connection->SocketContext, BufferData, @@ -475,6 +492,8 @@ UnlockObject(Connection, OldIrql); TI_DbgPrint(DEBUG_TCP, ("[IP, TCPSendData] Leaving. Status = %x\n", Status)); + + DbgPrint("[IP, TCPSendData] Leaving. Status = %x\n", Status); return Status; } 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 Jun 23 07:57:59 2011 @@ -494,9 +494,10 @@ tcp_recv(msg->Pcb, InternalRecvEventHandler); tcp_sent(msg->Pcb, InternalSendEventHandler); - msg->Error = tcp_connect(msg->Pcb, msg->IpAddress, ntohs(msg->Port), InternalConnectEventHandler); - if (msg->Error == ERR_OK) - msg->Error = ERR_INPROGRESS; + //if (msg->Error == ERR_OK) + // msg->Error = ERR_INPROGRESS; + err_t Error = tcp_connect(msg->Pcb, msg->IpAddress, ntohs(msg->Port), InternalConnectEventHandler); + msg->Error = Error == ERR_OK ? ERR_INPROGRESS : Error; KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); @@ -527,8 +528,6 @@ if (WaitForEventSafely(&msg->Event)) { ret = msg->Error; - if (pcb->state != CLOSED && ret == ERR_INPROGRESS) - ret = ERR_OK; } else ret = ERR_CLSD;

1 0

[agreen] 52431: Explorer_new changes - Run dialog in own thread - Fix MapWindowPoints error check - Various TrayWnd Theme
by agreen＠svn.reactos.org 23 Jun '11

23 Jun '11

Author: agreen Date: Thu Jun 23 05:49:03 2011 New Revision: 52431 URL: http://svn.reactos.org/svn/reactos?rev=52431&view=rev Log: Explorer_new changes - Run dialog in own thread - Fix MapWindowPoints error check - Various TrayWnd Theme Modified: branches/GSoC_2011/NewExplorer/base/shell/explorer-new/traywnd.c Modified: branches/GSoC_2011/NewExplorer/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/NewExplorer/base/shel… ============================================================================== --- branches/GSoC_2011/NewExplorer/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/GSoC_2011/NewExplorer/base/shell/explorer-new/traywnd.c [iso-8859-1] Thu Jun 23 05:49:03 2011 @@ -43,6 +43,7 @@ const IShellDesktopTrayVtbl *lpVtblShellDesktopTray; LONG Ref; + HTHEME TaskbarTheme; HWND hWnd; HWND hWndDesktop; @@ -1017,6 +1018,12 @@ /* FIXME: Unload bands */ ITrayBandSite_Release(This->TrayBandSite); This->TrayBandSite = NULL; + } + + if(This->TaskbarTheme) + { + CloseThemeData(This->TaskbarTheme); + This->TaskbarTheme = NULL; } ITrayWindowImpl_Release(ITrayWindow_from_impl(This)); @@ -1105,6 +1112,8 @@ BOOL Horizontal; HDWP dwp; + ITrayWindowImpl_UpdateStartButton(This, + NULL); if (prcClient != NULL) { rcClient = *prcClient; @@ -1392,11 +1401,25 @@ return hBitmap; } - +static VOID +ITrayWindowImpl_UpdateTheme(IN OUT ITrayWindowImpl *This) +{ + if(This->TaskbarTheme) + CloseThemeData(This->TaskbarTheme); + + if(IsThemeActive()) + This->TaskbarTheme = OpenThemeData(This->hWnd, L"Taskbar"); + else + This->TaskbarTheme = 0; +} static VOID ITrayWindowImpl_Create(IN OUT ITrayWindowImpl *This) { TCHAR szStartCaption[32]; + + + SetWindowTheme(This->hWnd,L"TaskBar", NULL); + ITrayWindowImpl_UpdateTheme(This); InterlockedIncrement(&TrayWndCount); @@ -1450,6 +1473,7 @@ NULL); if (This->hwndStart) { + SetWindowTheme(This->hwndStart, L"Start", NULL); SendMessage(This->hwndStart, WM_SETFONT, (WPARAM)This->hStartBtnFont, @@ -1530,6 +1554,7 @@ This->TrayBandSite = CreateTrayBandSite(ITrayWindow_from_impl(This), &This->hwndRebar, &This->hwndTaskSwitch); + SetWindowTheme(This->hwndRebar,L"TaskBar", NULL); /* Create the tray notification window */ This->hwndTrayNotify = CreateTrayNotifyWnd(ITrayWindow_from_impl(This), @@ -1851,6 +1876,105 @@ ITrayWindowImpl_Lock }; +static int ITrayWindowImpl_DrawBackground(IN ITrayWindowImpl *This, + IN HDC dc) +{ + int backoundPart; + RECT rect; + + GetClientRect(This->hWnd, &rect); + switch (This->Position) + { + case ABE_LEFT: + backoundPart=TBP_BACKGROUNDLEFT; + break; + case ABE_TOP: + backoundPart=TBP_BACKGROUNDTOP; + break; + case ABE_RIGHT: + backoundPart=TBP_BACKGROUNDRIGHT; + break; + case ABE_BOTTOM: + default: + backoundPart=TBP_BACKGROUNDBOTTOM; + break; + } + DrawThemeBackground(This->TaskbarTheme, dc, backoundPart, 0, &rect, 0); + return 0; +} + +static int ITrayWindowImpl_DrawSizer(IN ITrayWindowImpl *This, + IN HRGN hRgn) +{ + HDC hdc; + RECT rect; + int backoundPart; + + GetWindowRect (This->hWnd, &rect); + OffsetRect (&rect, -rect.left, -rect.top); + + hdc = GetDCEx(This->hWnd, hRgn, DCX_WINDOW|DCX_INTERSECTRGN|DCX_PARENTCLIP); + + switch (This->Position) + { + case ABE_LEFT: + backoundPart=TBP_SIZINGBARLEFT; + rect.left=rect.right-GetSystemMetrics(SM_CXSIZEFRAME); + break; + case ABE_TOP: + backoundPart=TBP_SIZINGBARTOP; + rect.top=rect.bottom-GetSystemMetrics(SM_CYSIZEFRAME); + break; + case ABE_RIGHT: + backoundPart=TBP_SIZINGBARRIGHT; + rect.right=rect.left+GetSystemMetrics(SM_CXSIZEFRAME); + break; + case ABE_BOTTOM: + default: + backoundPart=TBP_SIZINGBARBOTTOM; + rect.bottom=rect.top+GetSystemMetrics(SM_CYSIZEFRAME); + break; + } + + DrawThemeBackground(This->TaskbarTheme, hdc, backoundPart, 0, &rect, 0); + + ReleaseDC(This->hWnd, hdc); + return 0; +} +DWORD WINAPI RunFileDlgThread( LPVOID lpParam ) +{ + ITrayWindowImpl *This = (ITrayWindowImpl*)lpParam; + HANDLE hShell32; + RUNFILEDLG RunFileDlg; + HWND hwnd; + RECT posRect; + + GetWindowRect(This->hwndStart,&posRect); + + hwnd = CreateWindowEx(0, + WC_STATIC, + NULL, + WS_OVERLAPPED | WS_DISABLED | WS_CLIPSIBLINGS | WS_BORDER | SS_LEFT, + posRect.left, + posRect.top, + posRect.right-posRect.left, + posRect.bottom-posRect.top, + NULL, + NULL, + NULL, + NULL); + + hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); + RunFileDlg = (RUNFILEDLG)GetProcAddress(hShell32, (LPCSTR)61); + + RunFileDlg(hwnd, NULL, NULL, NULL, NULL, RFF_CALCDIRECTORY); + + DestroyWindow(hwnd); + + return 0; +} + + static LRESULT CALLBACK TrayWndProc(IN HWND hwnd, IN UINT uMsg, @@ -1891,6 +2015,23 @@ switch (uMsg) { + + case WM_THEMECHANGED: + ITrayWindowImpl_UpdateTheme(This); + return 0; + case WM_NCPAINT: + if(!This->TaskbarTheme) + goto DefHandler; + return ITrayWindowImpl_DrawSizer(This, + (HRGN)wParam); + case WM_ERASEBKGND: + if(!This->TaskbarTheme) + goto DefHandler; + return ITrayWindowImpl_DrawBackground(This, + (HDC)wParam); + case WM_CTLCOLORBTN: + SetBkMode((HDC)wParam, TRANSPARENT); + return (int)GetStockObject(HOLLOW_BRUSH); case WM_NCHITTEST: { RECT rcClient; @@ -1903,13 +2044,16 @@ clicks on the border. */ return HTBORDER; } - + + /* 0 is a possible valid response for MapWindowPoints. + While the default error code is 0. An extra check needs to be done */ + SetLastError(-1); if (GetClientRect(hwnd, &rcClient) && - MapWindowPoints(hwnd, + (MapWindowPoints(hwnd, NULL, (LPPOINT)&rcClient, - 2) != 0) + 2) != 0 || GetLastError()!=0)) { pt.x = (SHORT)LOWORD(lParam); pt.y = (SHORT)HIWORD(lParam); @@ -2005,7 +2149,7 @@ case WM_SIZE: { RECT rcClient; - + InvalidateRect(This->hWnd, NULL, TRUE); if (wParam == SIZE_RESTORED && lParam == 0) { ITrayWindowImpl_ResizeWorkArea(This); @@ -2350,13 +2494,12 @@ case IDM_RUN: { - HANDLE hShell32; - RUNFILEDLG RunFileDlg; - - hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); - RunFileDlg = (RUNFILEDLG)GetProcAddress(hShell32, (LPCSTR)61); - - RunFileDlg(hwnd, NULL, NULL, NULL, NULL, RFF_CALCDIRECTORY); + CreateThread(NULL, // default security attributes + 0, // use default stack size + RunFileDlgThread, // thread function name + This, // argument to thread function + 0, // use default creation flags + NULL); // returns the thread identifier break; }

1 0

[tkreuzer] 52430: [NTOSKRNL] Optimize KiSystemCallTrampoline inline assembly for MSVC. save one register, use eax for the handler address and don't assign to an intermediate variable before returni...
by tkreuzer＠svn.reactos.org 22 Jun '11

22 Jun '11

Author: tkreuzer Date: Wed Jun 22 20:15:58 2011 New Revision: 52430 URL: http://svn.reactos.org/svn/reactos?rev=52430&view=rev Log: [NTOSKRNL] Optimize KiSystemCallTrampoline inline assembly for MSVC. save one register, use eax for the handler address and don't assign to an intermediate variable before returning (hint by Alex) Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Wed Jun 22 20:15:58 2011 @@ -600,13 +600,6 @@ // // Performs a system call // -NTSTATUS -FORCEINLINE -KiSystemCallTrampoline(IN PVOID Handler, - IN PVOID Arguments, - IN ULONG StackBytes) -{ - NTSTATUS Result; /* * This sequence does a RtlCopyMemory(Stack - StackBytes, Arguments, StackBytes) @@ -624,6 +617,14 @@ * */ #ifdef __GNUC__ +NTSTATUS +FORCEINLINE +KiSystemCallTrampoline(IN PVOID Handler, + IN PVOID Arguments, + IN ULONG StackBytes) +{ + NTSTATUS Result; + __asm__ __volatile__ ( "subl %1, %%esp\n" @@ -639,26 +640,32 @@ "r"(Handler) : "%esp", "%esi", "%edi" ); + return Result; +} #elif defined(_MSC_VER) +NTSTATUS +FORCEINLINE +KiSystemCallTrampoline(IN PVOID Handler, + IN PVOID Arguments, + IN ULONG StackBytes) +{ __asm { mov ecx, StackBytes - mov edx, Arguments - mov ebx, Handler + mov esi, Arguments + mov eax, Handler sub esp, ecx mov edi, esp - mov esi, edx shr ecx, 2 rep movsd - call ebx - mov Result, eax + call eax } + /* Return with result in EAX */ +} #else #error Unknown Compiler #endif - return Result; -} // // Checks for pending APCs

1 0

[tkreuzer] 52429: [NTOSKRNL/HAL] - Fix a bug is MSVC inline assembly - use iretd instead of iret the msvc compiled kernel boots a bit further now
by tkreuzer＠svn.reactos.org 22 Jun '11

22 Jun '11

Author: tkreuzer Date: Wed Jun 22 19:04:28 2011 New Revision: 52429 URL: http://svn.reactos.org/svn/reactos?rev=52429&view=rev Log: [NTOSKRNL/HAL] - Fix a bug is MSVC inline assembly - use iretd instead of iret the msvc compiled kernel boots a bit further now Modified: trunk/reactos/hal/halx86/generic/i386/trap.S trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S Modified: trunk/reactos/hal/halx86/generic/i386/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/i386/tr… ============================================================================== --- trunk/reactos/hal/halx86/generic/i386/trap.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/i386/trap.S [iso-8859-1] Wed Jun 22 19:04:28 2011 @@ -24,7 +24,7 @@ @HalpExitToV86@4: /* Point esp to the iret frame and return */ lea esp, [ecx + KTRAP_FRAME_EIP] - iret + iretd /* Here starts the real mode code */ .code16 Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Wed Jun 22 19:04:28 2011 @@ -343,7 +343,7 @@ elseif (Flags AND KI_EXIT_IRET) /* Return with iret */ - iret + iretd elseif (Flags AND KI_EXIT_JMP) Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Wed Jun 22 19:04:28 2011 @@ -644,12 +644,13 @@ { mov ecx, StackBytes mov edx, Arguments + mov ebx, Handler sub esp, ecx mov edi, esp mov esi, edx shr ecx, 2 rep movsd - call Handler + call ebx mov Result, eax } #else @@ -803,7 +804,7 @@ #elif defined(_MSC_VER) __asm { - iret + iretd } #else #error Unsupported compiler Modified: trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/i386/kdb_hel… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S [iso-8859-1] Wed Jun 22 19:04:28 2011 @@ -116,7 +116,7 @@ /* * Return to the caller. */ - iret + iretd PUBLIC _KdbpStackSwitchAndCall@8

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